diff --git a/CHANGES.txt b/CHANGES.txt
index 751b75d24b..c1f69926ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
  * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
  * Fix sstablerepairedset (CASSANDRA-10132)
 Merged from 2.2:
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
  * Fix repair hang when snapshot failed (CASSANDRA-10057)
  * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
    (CASSANDRA-10199)
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 155aaf6f1a..0d207cd818 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -66,7 +66,7 @@ set JAVA_OPTS=-ea^
  -XX:CMSInitiatingOccupancyFraction=75^
  -XX:+UseCMSInitiatingOccupancyOnly^
  -Dlogback.configurationFile=logback.xml^
- -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin^
+ -Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
  -Dcassandra.jmx.local.port=7199
 REM **** JMX REMOTE ACCESS SETTINGS SEE: https://wiki.apache.org/cassandra/JmxSecurity ***
 REM -Dcom.sun.management.jmxremote.port=7199^
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index f6bc6a7a23..7a4a61e1b5 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -179,7 +179,7 @@ Function CalculateHeapSizes
 #-----------------------------------------------------------------------------
 Function SetJsr223Env
 {
-    $cp = """$env:CLASSPATH"""
+    $cp = $env:CLASSPATH
     foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
     {
         foreach ($file in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
@@ -301,7 +301,7 @@ Function SetCassandraEnvironment
 
     ParseJVMInfo
     # Add sigar env - see Cassandra-7838
-    $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+    $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
 
     # Confirm we're on high performance power plan, warn if not
     # Change to $true to suppress this warning