diff --git a/ChangeLog b/ChangeLog
index 2a0805d0..4ac8b2b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-fwknop-2.0.4 (11//2012):
+fwknop-2.0.4 (11/15/2012):
     - [server] Added upstart config at extras/upstart/fwknop.conf.  This
       allows the fwknopd to easily be managed with upstart via commands like
       "service fwknop start" and "service fwknop stop".
diff --git a/VERSION b/VERSION
index 3103e619..c2c8dec5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-fwknop-2.0.3
+fwknop-2.0.4
diff --git a/android/project/jni/config.h b/android/project/jni/config.h
index 85727474..ebc64b48 100644
--- a/android/project/jni/config.h
+++ b/android/project/jni/config.h
@@ -207,13 +207,13 @@
 #define PACKAGE_NAME "fwknop"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fwknop 2.0.3"
+#define PACKAGE_STRING "fwknop 2.0.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fwknop"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.3"
+#define PACKAGE_VERSION "2.0.4"
 
 /* The size of `unsigned int', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_INT 4
@@ -247,7 +247,7 @@
 
 
 /* Version number of package */
-#define VERSION "2.0.3"
+#define VERSION "2.0.4"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/android/project/jni/fwknop/fko.h b/android/project/jni/fwknop/fko.h
index 87389c72..d59dbaa5 100644
--- a/android/project/jni/fwknop/fko.h
+++ b/android/project/jni/fwknop/fko.h
@@ -55,7 +55,7 @@ extern "C" {
 
 /* General params
 */
-#define FKO_PROTOCOL_VERSION "2.0.3" /* The fwknop protocol version */
+#define FKO_PROTOCOL_VERSION "2.0.4" /* The fwknop protocol version */
 
 /* Supported FKO Message types...
 */
diff --git a/configure.ac b/configure.ac
index dd411ad8..4336bb4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PREREQ(2.62)
 
 dnl Define our name, version and email.
 m4_define(my_package,   [fwknop])
-m4_define(my_version,   [2.0.3])
+m4_define(my_version,   [2.0.4])
 m4_define(my_bug_email, [dstuart@dstuart.org])
 
 AC_INIT(my_package, my_version, my_bug_email)
diff --git a/fwknop.spec b/fwknop.spec
index 520073a8..ba82878e 100644
--- a/fwknop.spec
+++ b/fwknop.spec
@@ -13,7 +13,7 @@
 %define _mandir /usr/share/man
 
 Name:		fwknop
-Version:	2.0.3
+Version:	2.0.4
 Epoch:      1
 Release:	1%{?dist}
 Summary:	Firewall Knock Operator client.  An implementation of Single Packet Authorization.
@@ -30,13 +30,13 @@ Requires:	libfko, iptables
 
 
 %package -n libfko
-Version:	0.0.3
+Version:	0.0.4
 Summary:	The fwknop library
 Group:		Development/Libraries
 Requires:   gpg, gpgme
 
 %package -n libfko-devel
-Version:	0.0.3
+Version:	0.0.4
 Summary:	The fwknop library header and API docs
 Group:		Development/Libraries
 Requires:	libfko
@@ -143,6 +143,9 @@ fi
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/fwknop/access.conf
 
 %changelog
+* Thu Nov 15 2012 <mbr@cipherdyne.org>
+- fwknop-2.0.4 release.
+
 * Sat Nov  3 2012 Tomoyuki Kano <tomo@appletz.jp> - 1:2.0.3-1
 - Added missing include files.
 
diff --git a/iphone/Classes/config.h b/iphone/Classes/config.h
index 1c817868..61beea02 100644
--- a/iphone/Classes/config.h
+++ b/iphone/Classes/config.h
@@ -203,13 +203,13 @@ Copyright (C) Max Kastanas 2010
 #define PACKAGE_NAME "fwknop"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fwknop 2.0.3"
+#define PACKAGE_STRING "fwknop 2.0.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fwknop"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.3"
+#define PACKAGE_VERSION "2.0.4"
 
 /* The size of `unsigned int', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_INT 4
@@ -243,7 +243,7 @@ Copyright (C) Max Kastanas 2010
 
 
 /* Version number of package */
-#define VERSION "2.0.3"
+#define VERSION "2.0.4"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/lib/fko.h b/lib/fko.h
index 87389c72..d59dbaa5 100644
--- a/lib/fko.h
+++ b/lib/fko.h
@@ -55,7 +55,7 @@ extern "C" {
 
 /* General params
 */
-#define FKO_PROTOCOL_VERSION "2.0.3" /* The fwknop protocol version */
+#define FKO_PROTOCOL_VERSION "2.0.4" /* The fwknop protocol version */
 
 /* Supported FKO Message types...
 */