diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index a2c071f1f1..7a97118f04 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -208,11 +208,11 @@
          <bean name="transformer.ImageMagick.Command" class="org.alfresco.util.exec.RuntimeExec">
             <property name="commandMap">
                 <map>
-                    <entry key="Linux">
-                        <value>imconvert ${source} ${options} ${target}</value>
+                    <entry key="Windows.*">
+                        <value>imconvert "${source}" ${options} "${target}"</value>
                     </entry>
                     <entry key=".*">
-                        <value>imconvert "${source}" ${options} "${target}"</value>
+                        <value>imconvert ${source} ${options} ${target}</value>
                     </entry>
                 </map>
             </property>