diff --git a/CHANGES.txt b/CHANGES.txt
index a4f3c72553..e268270068 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,8 @@
    (CASSANDRA-2206)
  * fix supercolumn de/serialization when subcolumn comparator is different
    from supercolumn's (CASSANDRA-2104)
+ * fix starting up on Windows when CASSANDRA_HOME contains whitespace
+   (CASSANDRA-2237)
 
 
 0.7.2
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index d016460a8e..bf23ac6428 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -43,7 +43,7 @@ set JAVA_OPTS=^
 REM ***** CLASSPATH library setting *****
 
 REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=%CASSANDRA_HOME%\conf
+set CLASSPATH="%CASSANDRA_HOME%\conf"
 
 REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
 for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"