diff --git a/AUTHORS b/AUTHORS
index 8d37cbaf..f0173ce3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Primary authors:
 Significant contributions from individuals are listed in the CREDITS file, and
 a special thanks is due to:
 
+    Jonathan Bennett (Major contributor, OpenWRT support, new Android client)
     Franck Joncourt (Major contributor and Debian package maintainer)
     Sebastien Jeanquier (Masters thesis analysis of Port Knocking and SPA)
     Hank Leininger (libfko error code patch, various architecture ideas)
@@ -30,9 +31,8 @@ a special thanks is due to:
     Vlad Glagolev (OpenBSD port)
     Blair Zajac (PPC architecture fixes, various architecture ideas)
     Radostan Riedel (AppArmor policy)
-    Jonathan Bennett (OpenWRT support)
 
-Copyright (C) 2009-2014 fwknop developers and contributors. For a full
+Copyright (C) 2009-2015 fwknop developers and contributors. For a full
 list of contributors, see the file 'CREDITS'.
 
  This file is distributed in the hope that it will be useful, but
diff --git a/CREDITS b/CREDITS
index 0d971a99..0cbde9cb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,10 +1,12 @@
 Jonathan Bennett
+    - Major contributor.
     - Contributed OpenWRT support - see the extras/openwrt/ directory.
     - Suggested the addition of the --key-gen option to fwknopd.
     - Contributed the console-qr.sh script (in extras/console-qr/) to create
       QR codes from fwknopd access.conf keys.
     - Wrote a new fwknop client for Android called "Fwknop2" - see:
         https://f-droid.org/repository/browse/?fdid=org.cipherdyne.fwknop2
+    - Developed the access.conf %include and %include_folder directives.
 
 Sebastien Jeanquier
     - Assisted with getting fwknop included in BackTrack Linux - the choice