diff --git a/CREDITS b/CREDITS
index e3e59e24..de17d9e2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -55,6 +55,7 @@ Franck Joncourt
     - Added log module support for the client.
     - Added the ability to read a passphrase from STDIN and also from a file
       descriptor via --fd (closes #74).
+    - Added libfko unit tests via the CUnit framework.
 
 Jonathan Schulz
     - Submitted patches to change HTTP connection type to 'close' for -R mode
@@ -213,3 +214,8 @@ Grant Pannell
 Alexander Kozhevnikov
     - Reported a bug when fwknop is compiled with --enable-udp-server where
       the server was including pcap.h
+
+Dan Brooks
+    - Contributed a patch for the Android client app to add the definition of
+      custom server udp port. This is similiar to the --server-port argument
+      offered by the main fwknop client.
diff --git a/ChangeLog b/ChangeLog
index 47d8642c..c422272e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ fwknop-2.6.6 (04//2015):
     - [server] Bug fix when compiled with --enable-udp-server to not include
       pcap.h, which is likely not installed whenever libpcap is also not
       installed. This bug was reported by Alexander Kozhevnikov.
+    - [android] (Dan Brooks) Contributed a patch for the Android client app to
+      add the definition of custom server udp port. This is similiar to the
+      --server-port argument offered by the main fwknop client.
     - [test suite] Set AFL_HARDEN=1 to AFL fuzzing wrapper scripts. This
       enables simple memory bug detection in AFL at the cost of a small
       performance hit.
@@ -21,6 +24,8 @@ fwknop-2.6.6 (04//2015):
     - [build] Add --enable-asan-support to autoconf configure script to enable
       Google's Address Sanitizer (ASan) support. This feature is used during
       the testing phase for new fwknop releases.
+    - [test suite] (Franck Joncourt) Added libfko unit tests with the CUnit
+      framework.
 
 fwknop-2.6.5 (12/16/2014):
     - [server] (Grant Pannell) Added a new access.conf variable "DESTINATION"