diff --git a/ChangeLog b/ChangeLog
index 4c9a2b1e..98a60b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-fwknop-2.6.10 (11//2016):
+fwknop-2.6.10 (08/06/2018):
     - [server] Add MAX_FW_TIMEOUT to access.conf stanzas to allow a maximum
       number of seconds for client-specified timeouts in SPA packets. This
       fixes issue #226 which was spotted by Jeremiah Rothschild.
@@ -9,6 +9,8 @@ fwknop-2.6.10 (11//2016):
     - [build] Jérémie Courrèges-Anglas and Ingo Feinerer contributed a patch
       to fix endian detection on OpenBSD systems based on information
       contained here: https://www.opengroup.org/austin/docs/austin_514.txt
+    - [client/server] (Michael Stair) Added client and server infrastructure
+      written in Erlang. See the erlang/ directory.
 
 fwknop-2.6.9 (06/08/2016):
     - (Jonathan Bennett) Added support for the SHA3 "Keccak" algorithm
diff --git a/Makefile.am b/Makefile.am
index 94b0d7af..a4ead871 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,13 @@ EXTRA_DIST = \
     iphone/Classes/bridge_fwknop.c \
     iphone/Classes/logutils.h \
     m4/gpgme.m4 \
+    erlang/LICENSE \
+    erlang/README.md \
+    erlang/rebar.config \
+    erlang/src/fwknop.app.src \
+    erlang/src/fwknop.erl \
+    erlang/src/fwknop_tests.erl \
+    erlang/src/server.erl \
     perl/FKO/README \
     perl/FKO/inc/Devel/CheckLib.pm \
     perl/FKO/MANIFEST \