diff --git a/CREDITS b/CREDITS
index 66d860d2..2a9c586d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -184,3 +184,13 @@ Tim Heckman
 Barry Allard
     - Reported bug in PF support on FreeBSD systems where ALTQ is not available
       would cause new PF rules to not be added (github issue #121).
+
+Bill Stubbs
+    - Submitted a patch to fix a bug where fwknopd could not handle Ethernet
+      frames that include the Frame Check Sequence (FCS) header. This header is
+      four bytes long, and is placed at the end of each Ethernet frame.
+      Normally the FCS header is not visible to libpcap, but some card/driver
+      combinations result in it being included. Bill noticed this on the
+      following platform:
+          BeagleBone Black rev C running 3.8.13-bone50 #1 SMP Tue May 13
+          13:24:52 UTC 2014 armv7l GNU/Linux
diff --git a/ChangeLog b/ChangeLog
index aeb2280f..4a4d0d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+fwknop-2.6.4 (09//2014):
+    - (Bill Stubbs) submitted a patch to fix a bug where fwknopd could not
+      handle Ethernet frames that include the Frame Check Sequence (FCS)
+      header. This header is four bytes long, and is placed at the end of each
+      Ethernet frame. Normally the FCS header is not visible to libpcap, but
+      some card/driver combinations result in it being included. Bill noticed
+      this on the following platform:
+
+          BeagleBone Black rev C running 3.8.13-bone50 #1 SMP Tue May 13
+          13:24:52 UTC 2014 armv7l GNU/Linux
+
 fwknop-2.6.3 (07/28/2014):
     - [client] External IP resolution via '-R' (or '--resolve-ip-http') is now
       done via SSL by default. The IP resolution URL is now