diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 5e5611cd..8330123c 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,6 +1,7 @@
-Portions Copyright (C) 2016 Flinders University
+Portions Copyright (C) 2016-2017 Flinders University
 Portions Copyright (C) 2010-2015 Serval Project Inc.
 Portions Copyright (C) 2010-2013 Paul Gardner-Stephen
 Portions Copyright (C) 2013 Petter Reinholdtsen
 Portions Copyright (C) 2010-2012 Serval Project Pty Limited
 Portions Copyright (C) 2012 Andrew Tridgell, All Rights Reserved
+Portions Copyright (C) 2002-2004 Phil Karn, KA9Q
diff --git a/Makefile.in b/Makefile.in
index a254e970..bca816b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -474,7 +474,12 @@ COPYRIGHT_TOOL := $(call findPATH,sp-copyright-tool)
 copyright:
 	@if [ -x "$(COPYRIGHT_TOOL)" ]; then \
 	    echo GENERATE COPYRIGHT.txt; \
-	    $(COPYRIGHT_TOOL) -o COPYRIGHT.txt condense *.c *.h; \
+		$(COPYRIGHT_TOOL) -o COPYRIGHT.txt condense \
+			$(PREFIXED_HEADERS) \
+			$(PREFIXED_SOURCES) \
+			$(find $(srcdir)/java-api -type f -name '*.java') \
+			$(find $(srcdir)/swift-api -type f -name '*.swift') \
+		    ; \
 	else \
 	    echo 'sp-copyright-tool is not in $$PATH; COPYRIGHT.txt not updated'; \
 	fi