diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 140b1861..5e5611cd 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,8 +1,6 @@
-Portions Copyright (C) 2010-2013 Serval Project Inc.
+Portions Copyright (C) 2016 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) 2000-2001 Aaron D. Gifford
 Portions Copyright (C) 2010-2012 Serval Project Pty Limited
-Portions Copyright (C) 2006-2008 Linpro AS
 Portions Copyright (C) 2012 Andrew Tridgell, All Rights Reserved
-Portions Copyright (C) 2006 Verdens Gang AS
diff --git a/base64.c b/base64.c
index 3e3f1ac9..6f44b802 100644
--- a/base64.c
+++ b/base64.c
@@ -1,6 +1,6 @@
 /*
  Serval Base64 primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2013 Serval Project Inc.
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff --git a/base64.h b/base64.h
index b294763e..0e90cfe1 100644
--- a/base64.h
+++ b/base64.h
@@ -1,6 +1,6 @@
 /*
  Serval Base64 primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2013 Serval Project Inc.
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff --git a/log_on_config_change.c b/log_on_config_change.c
index fbdc872b..e2bd2404 100644
--- a/log_on_config_change.c
+++ b/log_on_config_change.c
@@ -1,6 +1,6 @@
 /*
 Serval DNA logging
-Copyright 2016 Serval Project Inc.
+Copyright 2016 Flinders University
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/nibble_tree.c b/nibble_tree.c
index 370f5601..87ab725d 100644
--- a/nibble_tree.c
+++ b/nibble_tree.c
@@ -1,6 +1,7 @@
 /*
 Serval DNA
-Copyright (C) 2016 Serval Project Inc.
+Copyright (C) 2012-2015 Serval Project Inc.
+Copyright (C) 2016 Flinders University
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/nibble_tree.h b/nibble_tree.h
index 6fd8210a..634eba50 100644
--- a/nibble_tree.h
+++ b/nibble_tree.h
@@ -1,6 +1,7 @@
 /*
 Serval DNA
-Copyright (C) 2016 Serval Project Inc.
+Copyright (C) 2012-2015 Serval Project Inc.
+Copyright (C) 2016 Flinders University
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -70,4 +71,4 @@ int tree_walk(struct tree_root *root, const uint8_t *binary, size_t bin_length,
 // walk the tree where nodes match the prefix binary / bin_length
 int tree_walk_prefix(struct tree_root *root, const uint8_t *binary, size_t bin_length, walk_callback callback, void *context);
 
-#endif
\ No newline at end of file
+#endif // __SERVAL_DNA__NIBBLE_TREE_H
diff --git a/numeric_str.c b/numeric_str.c
index 2ac411ed..87a4157b 100644
--- a/numeric_str.c
+++ b/numeric_str.c
@@ -1,6 +1,6 @@
 /*
  Serval numerical string primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2012-2015 Serval Project Inc.
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff --git a/numeric_str.h b/numeric_str.h
index 4f426498..08b83bed 100644
--- a/numeric_str.h
+++ b/numeric_str.h
@@ -1,6 +1,6 @@
 /*
  Serval numerical string primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2012-2015 Serval Project Inc.
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff --git a/overlay_address.c b/overlay_address.c
index 4268d19a..e358911d 100644
--- a/overlay_address.c
+++ b/overlay_address.c
@@ -1,6 +1,6 @@
 /*
 Serval DNA MDP addressing
-Copyright (C) 2012-2013 Serval Project Inc.
+Copyright (C) 2012-2015 Serval Project Inc.
 Copyright (C) 2012 Paul Gardner-Stephen
  
 This program is free software; you can redistribute it and/or
diff --git a/server_httpd.c b/server_httpd.c
index 812e474d..689ce15b 100644
--- a/server_httpd.c
+++ b/server_httpd.c
@@ -1,3 +1,22 @@
+/*
+Serval DNA essential server HTTP pages
+Copyright (C) 2016 Flinders University
+Copyright (C) 2015 Serval Project Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "serval.h"
 #include "httpd.h"
diff --git a/str.c b/str.c
index 6363ffbc..ed9e42a2 100644
--- a/str.c
+++ b/str.c
@@ -1,6 +1,7 @@
 /*
  Serval string primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2012-2015 Serval Project Inc.
+ Copyright (C) 2016 Flinders University
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff --git a/str.h b/str.h
index bebfddb8..e85bb164 100644
--- a/str.h
+++ b/str.h
@@ -1,6 +1,7 @@
 /*
  Serval string primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2012-2015 Serval Project Inc.
+ Copyright (C) 2016 Flinders University
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff --git a/uri.c b/uri.c
index 61c0318a..c8eedfcb 100644
--- a/uri.c
+++ b/uri.c
@@ -1,6 +1,6 @@
 /*
  Serval URI primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2015 Serval Project Inc.
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
diff --git a/uri.h b/uri.h
index a0623efe..cca0379b 100644
--- a/uri.h
+++ b/uri.h
@@ -1,6 +1,6 @@
 /*
  Serval URI primitives
- Copyright (C) 2012-2016 Serval Project Inc.
+ Copyright (C) 2015 Serval Project Inc.
  
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License