diff --git a/Assets/PatchKit Patcher/Scripts/AppStarter.cs b/Assets/PatchKit Patcher/Scripts/AppStarter.cs
index 92a848a6..970240f0 100644
--- a/Assets/PatchKit Patcher/Scripts/AppStarter.cs	
+++ b/Assets/PatchKit Patcher/Scripts/AppStarter.cs	
@@ -72,7 +72,7 @@ private ProcessStartInfo GetProcessStartInfo(string executablePath, PlatformType
                     return new ProcessStartInfo
                     {
                         FileName = executablePath,
-                        Arguments = string.Format("+patcher-data-location {0}", _app.LocalMetaData.GetFilePath()),
+                        Arguments = string.Format("+patcher-data-location \"{0}\"", _app.LocalMetaData.GetFilePath()),
                         WorkingDirectory = workingDir
                     };
                 case PlatformType.OSX:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1992ef80..b3393683 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Handling of the ZLib exception
+- Invalid handling of patcher-data-location argument with spaces
 
 ## [3.9.2]
 ### Added