diff --git a/ChangeLog b/ChangeLog
index 4533ce13b6..42468ce7a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 Changes so far in 0.0.9:
+rc4:
+  o Bugfixes on 0.0.8.1:
+    - Make windows sockets actually non-blocking (oops), and handle
+      win32 socket errors better.
+
+  o Bugfixes on 0.0.9rc1:
+    - Actually catch the -USR2 signal.
+
 rc3:
   o Bugfixes on 0.0.8.1:
     - Flush the log file descriptor after we print "Tor opening log file",
diff --git a/configure.in b/configure.in
index 1d441446cd..86e2b80e1b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.0.9rc4-cvs)
+AM_INIT_AUTOMAKE(tor, 0.0.9rc4)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor.nsi b/contrib/tor.nsi
index 88a5ed980a..c05dabfbbd 100644
--- a/contrib/tor.nsi
+++ b/contrib/tor.nsi
@@ -31,7 +31,7 @@
 
 !include "MUI.nsh"
 
-!define VERSION "0.0.9rc4-cvs"
+!define VERSION "0.0.9rc4"
 !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 a51ae13a2d..5956ff033c 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.9rc4-cvs"
+#define VERSION "0.0.9rc4"