diff --git a/ChangeLog b/ChangeLog
index 6449a1e88dc20dc17233cbbb3ac1652f84a16840..6b4ee958f1209ebb60fda2030bb71e77ce74caf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,19 @@
-Changes in version 0.2.1.4-alpha - 2008-08-??
+Changes in version 0.2.1.4-alpha - 2008-08-04
   o Major bugfixes:
-    - The address part of exit policies was not correctly written to router
-      descriptors which made them unparseable. Noticed by phobos, fixed by
-      karsten. Bugfix on 0.2.1.3-alpha.
-    - When extending a circuit to a relay to which a connection has
-      been established before, a false assertion was triggered. Noticed by
-      phobos, fixed by karsten. Bugfix on 0.2.1.3-alpha.
+    - The address part of exit policies was not correctly written
+      to router descriptors. This generated router descriptors that failed
+      their self-checks. Noticed by phobos, fixed by Karsten. Bugfix
+      on 0.2.1.3-alpha.
+    - Tor triggered a false assert when extending a circuit to a relay
+      but we already have a connection open to that relay. Noticed by
+      phobos, fixed by Karsten. Bugfix on 0.2.1.3-alpha.
 
   o Minor bugfixes:
-    - In some edge cases it occurs that the router descriptor of a
-      previously picked introduction point becomes obsolete. In that case,
-      don't stick to using this introduction point, but simply give up on
-      it. Observed by xiando. Bugfix on 0.2.1.3-alpha.
+    - Fix a hidden service logging bug: in some edge cases, the router
+      descriptor of a previously picked introduction point becomes
+      obsolete and we need to give up on it rather than continually
+      complaining that it has become obsolete. Observed by xiando. Bugfix
+      on 0.2.1.3-alpha.
 
 
 Changes in version 0.2.1.3-alpha - 2008-08-03
diff --git a/configure.in b/configure.in
index fd45b27f0806f7ed97934fd31bc7ac42db4d9451..679eb88df2d35b3bf5675220d95fb25c73a7b9f7 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.1.3-alpha)
+AM_INIT_AUTOMAKE(tor, 0.2.1.4-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index b45be9af151825aca2853b8cd575ff937da27a70..8bcb40225823cbcc18e4c2f3ccd8a1ccd3411e86 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -9,7 +9,7 @@
 !include "FileFunc.nsh"
 !insertmacro GetParameters
   
-!define VERSION "0.2.1.3-alpha"
+!define VERSION "0.2.1.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index d9153c70053e1f263b108dc87ad870e6189bbc79..863ee232f57e5e2a92b637b6cf97dfe3541fa265 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -227,6 +227,6 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.1.3-alpha"
+#define VERSION "0.2.1.4-alpha"