diff --git a/ChangeLog b/ChangeLog
index e5c7ed4a3c..5460de2087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1398,7 +1398,7 @@ Changes in version 0.2.0.10-alpha - 2007-11-10
     - Stop leaking memory every time we parse a v3 certificate. Bugfix
       on 0.2.0.1-alpha.
     - Stop leaking memory every time we load a v3 certificate. Bugfix
-      on 0.2.0.1-alpha. Fixes Bug 536.
+      on 0.2.0.1-alpha. Fixes bug 536.
     - Stop leaking a cached networkstatus on exit.  Bugfix on
       0.2.0.3-alpha.
     - Stop leaking voter information every time we free a consensus.
diff --git a/configure.in b/configure.in
index 679eb88df2..d931ed4f6f 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.4-alpha)
+AM_INIT_AUTOMAKE(tor, 0.2.1.4-alpha-dev)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 8bcb402258..66290816a2 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.4-alpha"
+!define VERSION "0.2.1.4-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
diff --git a/doc/TODO.future b/doc/TODO.future
index 3155330d5a..105d4b3770 100644
--- a/doc/TODO.future
+++ b/doc/TODO.future
@@ -23,6 +23,7 @@ K       - Karsten claims
 =======================================================================
 
 Later, unless people want to implement them now:
+  - tor as a socks proxy should accept (and ignore) password auth
   - Actually use SSL_shutdown to close our TLS connections.
   - Include "v" line in networkstatus getinfo values.
     [Nick: bridge authorities output a networkstatus that is missing
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 863ee232f5..20e3bfb7e5 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.4-alpha"
+#define VERSION "0.2.1.4-alpha-dev"