diff --git a/dist/main/index.js b/dist/main/index.js
index 94d1183..44d6d34 100644
--- a/dist/main/index.js
+++ b/dist/main/index.js
@@ -1073,7 +1073,7 @@ class Packages {
                     // Clean up, no need for the file to lay around any more
                     yield (0, exec_1.exec)(`rm ${pkgFile}`);
                     for (const fpkg of pkg.Packages) {
-                        const pkgLPKFile = path.join(pkgFolder, pkg.PackageBaseDir, fpkg.RelativeFilePath.replace(/ /gi, '\ '), fpkg.PackageFile);
+                        const pkgLPKFile = path.join(pkgFolder, pkg.PackageBaseDir.replace(/ /gi, '\ '), fpkg.RelativeFilePath.replace(/ /gi, '\ '), fpkg.PackageFile.replace(/ /gi, '\ '));
                         switch (fpkg.PackageType) {
                             case 0:
                             case 1:
diff --git a/package.json b/package.json
index cb0296c..5de131c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-lazarus",
-  "version": "3.2.10",
+  "version": "3.2.11",
   "description": "Set up your GitHub Actions workflow with a specific version of Lazarus",
   "main": "lib/main.js",
   "scripts": {
diff --git a/src/Packages.ts b/src/Packages.ts
index f4b40dc..23c381c 100644
--- a/src/Packages.ts
+++ b/src/Packages.ts
@@ -68,9 +68,9 @@ export class Packages {
 
                     const pkgLPKFile = path.join(
                         pkgFolder,
-                        pkg.PackageBaseDir,
+                        pkg.PackageBaseDir.replace(/ /gi, '\ '),
                         fpkg.RelativeFilePath.replace(/ /gi, '\ '),
-                        fpkg.PackageFile
+                        fpkg.PackageFile.replace(/ /gi, '\ ')
                     );
 
                     switch (fpkg.PackageType) {
diff --git a/src/constants.ts b/src/constants.ts
index d382fe8..48a9674 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1 +1 @@
-export const _version = "3.2.10";
+export const _version = "3.2.11";