diff --git a/assembly/src/release/bin/win32/wrapper.conf b/assembly/src/release/bin/win32/wrapper.conf
index 39bb53e7f6..bd1a4ed49d 100644
--- a/assembly/src/release/bin/win32/wrapper.conf
+++ b/assembly/src/release/bin/win32/wrapper.conf
@@ -43,12 +43,12 @@ wrapper.java.library.path.1=%ACTIVEMQ_HOME%/bin/win32
 
 # Java Additional Parameters
 # note that n is the parameter number starting from 1.
-wrapper.java.additional.1=-Dactivemq.home=%ACTIVEMQ_HOME%
-wrapper.java.additional.2=-Dactivemq.base=%ACTIVEMQ_BASE%
+wrapper.java.additional.1=-Dactivemq.home="%ACTIVEMQ_HOME%"
+wrapper.java.additional.2=-Dactivemq.base="%ACTIVEMQ_BASE%"
 wrapper.java.additional.3=-Djavax.net.ssl.keyStorePassword=password
 wrapper.java.additional.4=-Djavax.net.ssl.trustStorePassword=password
-wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.ks
-wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
+wrapper.java.additional.5=-Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks"
+wrapper.java.additional.6=-Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
 wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true