diff --git a/ChangeLog b/ChangeLog
index 08c81e25a6..8c2eb42cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ rc7:
 
   o Bugfixes on 0.0.8.1:
     - Fix a whole slew of memory leaks.
+    - Fix isspace() and friends so they still make Solaris happy
+      but also so they don't trigger asserts on win32.
     - Fix parse_iso_time on platforms without strptime (eg win32).
     - win32: tolerate extra "readable" events better.
     - win32: when being multithreaded, leave parent fdarray open.
diff --git a/configure.in b/configure.in
index f18131b5e7..80e07d926f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.0.9rc7-cvs)
+AM_INIT_AUTOMAKE(tor, 0.0.9rc7)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor.nsi b/contrib/tor.nsi
index 760afeafce..24e9d903ac 100644
--- a/contrib/tor.nsi
+++ b/contrib/tor.nsi
@@ -31,7 +31,7 @@
 
 !include "MUI.nsh"
 
-!define VERSION "0.0.9rc7-cvs"
+!define VERSION "0.0.9rc7"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "http://freehaven.net/tor/"
 
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index c08b48d992..e482241ac7 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -199,4 +199,4 @@
 #define UNALIGNED_INT_ACCESS_OK
 
 /* Version number of package */
-#define VERSION "0.0.9rc7-cvs"
+#define VERSION "0.0.9rc7"