diff --git a/ChangeLog b/ChangeLog
index 01d0d76c9..7df8045cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 3.21.3  [DEVEL] (rgerhards), 2008-08-??
+Version 3.21.3  [DEVEL] (rgerhards), 2008-08-13
 - added ability to specify flow control mode for imuxsock
 - added ability to execute actions only after the n-th call of the action
   This also lead to the addition of two new config directives:
@@ -12,6 +12,17 @@ Version 3.21.3  [DEVEL] (rgerhards), 2008-08-??
   New syntax @[addr]:port introduced to enable that. Root problem was IPv6
   addresses contain colons.
 - somewhat enhanced debugging messages
+- imported from 3.18.3:
+  - enhanced ommysql to support custom port to connect to server
+    Port can be set via new $ActionOmmysqlServerPort config directive
+    Note: this was a very minor change and thus deemed appropriate to be
+    done in the stable release.
+  - bugfix: misspelled config directive, previously was
+    $MainMsgQueueWorkeTimeoutrThreadShutdown, is now
+    $MainMsgQueueWorkerTimeoutThreadShutdown. Note that the misspelled
+    directive is not preserved - if the misspelled directive was used
+    (which I consider highly unlikely), the config file must be changed.
+    Thanks to lperr for reporting the bug.
 ---------------------------------------------------------------------------
 Version 3.21.2  [DEVEL] (rgerhards), 2008-08-04
 - added $InputUnixListenSocketHostName config directive, which permits to
diff --git a/configure.ac b/configure.ac
index f35c38d4e..5f7d18e36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[3.21.3-Test5],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[3.21.3],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([ChangeLog])
 AC_CONFIG_HEADERS([config.h])
diff --git a/doc/manual.html b/doc/manual.html
index d672da524..5fc65d876 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the
 novice user. And as we know what enterprise users really need, there is
 also <a href="professional_support.html">professional
 rsyslog support</a> available directly from the source!</p>
-<p><b>This documentation is for version 3.21.2 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.21.3 (devel branch) of rsyslog.</b>
 Visit the <i> <a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b> to obtain current
 version information and project status.
 </p><p><b>If you like rsyslog, you might