diff --git a/LICENSE.txt b/LICENSE.txt
index 101823a2e411..b9a2493c98da 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,9 +1,8 @@
 NOTE
 ----
 
-Please note that LibreNMS is covered by the GPLv3, but also includes an
-exception for included third-party packages.  Please see README.md for full
-details of this exception.
+LibreNMS is covered by the GPLv3, and includes exceptions for included
+third-party packages.  Please see README.md for full details.
 
 
 Original GPLv3 text
diff --git a/README.md b/README.md
index 0668ebd80102..4dd9fd2b8277 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ License
 
 Copyright (C) 2006-2012 Adam Armstrong <adama@memetic.org>
 
-Copyright (C) 2013 LibreNMS Contributors <librenms-project@googlegroups.com>
+Copyright (C) 2013-2014 by individual LibreNMS contributors
 
  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
diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
index d8135e1b4732..6b2a6d93b989 100644
--- a/doc/CONTRIBUTING.md
+++ b/doc/CONTRIBUTING.md
@@ -23,10 +23,31 @@ the commit log that you agree to the conditions of the Contributor Agreement
 contained in doc/CONTRIBUTING.md.
 
 Note that contributors to LibreNMS retain copyright to their own code and
-are not required to sign over their rights to any other party.  We recommend
-that if you add a new file containing original code to the code base that
-you include a copyright notice in it as per the Free Software Foundation's
-guidelines.
+are not required to sign over their rights to any other party.  You maintain
+all rights to your own code.
+
+We recommend that if you add a new file containing original code to the code
+base that you include a copyright notice in it as per the Free Software
+Foundation's guidelines.  You might find something like the following header
+appropriate (although this is not legal advice ;-):
+
+  <?php
+  /*
+   * LibreNMS module to frob blurgs from a foo bar
+   *
+   * Copyright (c) 2014 Internet Widgitz Pty Ltd <http://example.com/>
+   *
+   * 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 3 of the License, or (at your
+   * option) any later version.  Please see LICENSE.txt at the top level of
+   * the source code distribution for details.
+   */
+  ?>
+
+The GPLv3 itself also contains recommendations about applying the GPL to
+your code.  Please see LICENSE.txt at the top of this source code
+distribution for details.
 
 
 Guidelines for contributing to LibreNMS