diff --git a/ChangeLog.txt b/ChangeLog.txt
index b5ac32c..ec9d9e1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,7 @@
 Changes since 2.9
 -----------------
+  * Fixed failure to compile messages.mc in paths containing spaces.
+
   * Fixed edge case with CreateProcess().
 
     Correctly handle the case where the application executable is under
diff --git a/README.txt b/README.txt
index d609015..abc22cd 100644
--- a/README.txt
+++ b/README.txt
@@ -178,7 +178,8 @@ Thanks to Arve Knudsen for spotting that child processes of the monitored
 application could be left running on service shutdown, and that a missing
 registry value for AppDirectory confused NSSM.
 Thanks to Peter Wagemans and Laszlo Keresztfalvi for suggesting throttling restarts.
-Thanks to Eugene Lifshitz for finding an edge case in CreateProcess().
+Thanks to Eugene Lifshitz for finding an edge case in CreateProcess() and for
+advising how to build messages.mc correctly in paths containing spaces.
 
 Licence
 -------
diff --git a/nssm.vcproj b/nssm.vcproj
index b85c1e7..f9afffd 100755
--- a/nssm.vcproj
+++ b/nssm.vcproj
@@ -694,7 +694,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)/$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 			</FileConfiguration>
@@ -704,7 +704,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)\$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 			</FileConfiguration>
@@ -714,7 +714,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)/$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					AdditionalDependencies=""
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
@@ -725,7 +725,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)/$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					AdditionalDependencies=""
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>