diff --git a/ChangeLog b/ChangeLog
index 0c630b43f6..e0b4fb519c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,24 +1,24 @@
-Changes in version 0.2.1.2-alpha - 2008-06-??
+Changes in version 0.2.1.2-alpha - 2008-06-20
   o Major features:
-    - New TestingTorNetwork option to allow adjustment of previously constant
-      values that, while reasonable, could slow bootstrapping.  Implements
-      proposal 135.  Patch from Karsten.
+    - New TestingTorNetwork option to allow adjustment of previously
+      constant values that, while reasonable, could slow bootstrapping.
+      Implements proposal 135. Patch from Karsten.
 
   o Major bugfixes:
-    - If you have more than one bridge but don't know their keys,
+    - If you have more than one bridge but don't know their digests,
       you would only learn a request for the descriptor of the first one
       on your list. (Tor considered launching requests for the others, but
       found that it already had a connection on the way for $0000...0000
       so it didn't open another.)
-    - If you have more than one bridge but don't know their keys, and the
-      connection to one of the bridges failed, you would cancel all
-      pending bridge connections. (After all, they all have the same
-      digest.)
+    - If you have more than one bridge but don't know their digests,
+      and the connection to one of the bridges failed, you would cancel
+      all pending bridge connections. (After all, they all have the
+      same digest.)
 
   o Minor features:
     - Allow OpenSSL to use dynamic locks if it wants.
-    - When building a consensus do not include routers that are down.
-      This will cut down 30% to 40% on consensus size.  Implements
+    - When building a consensus, do not include routers that are down.
+      This will cut down 30% to 40% on consensus size. Implements
       proposal 138.
     - In directory authorities' approved-routers files, allow
       fingerprints with or without space.
@@ -33,10 +33,11 @@ Changes in version 0.2.1.2-alpha - 2008-06-??
       would crash a dirserver if it did not already have a consensus.
     - Clean up some macro/CPP interactions: some GCC versions don't like
       #if/#endif pairs inside macro arguments.  Fixes bug 707.
-    - When establishing a hidden service, introduction points that originate
-      from cannibalized circuits are completely ignored and not included in
-      rendezvous service descriptors. This might be another reason for delay
-      in making a hidden service available. Bugfix on 0.2.0.14-alpha.
+    - When establishing a hidden service, introduction points that
+      originate from cannibalized circuits are completely ignored and not
+      included in rendezvous service descriptors. This might be another
+      reason for delay in making a hidden service available. Bugfix
+      from long ago (0.0.9.x?)
 
   o Bootstrapping bugfixes:
     - Directory authorities shouldn't complain about bootstrapping
diff --git a/configure.in b/configure.in
index 8fec6b785c..62be45ef41 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.1-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.1.2-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index c72ff464a6..8dc14e0281 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.1-alpha-dev"
+!define VERSION "0.2.1.2-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 0c4aa9597b..f548d5f2ca 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.1-alpha-dev"
+#define VERSION "0.2.1.2-alpha"