diff --git a/ide/Makefile b/ide/Makefile
index 91bc6d9f36..0f468a85a8 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -272,7 +272,7 @@ LAZARUS_CONFIG_DIR=$(HOME)/.lazarus
 endif
 endif
 export LAZARUS_CONFIG_DIR
-LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
+LAZARUS_IDE_CONFIG='$(LAZARUS_CONFIG_DIR)/idemake.cfg'
 LAZARUS_OPT=$(LAZARUS_LIBPATHS)
 BIG_IDE_OPTIONS=-dBigIDE $(LAZARUS_LIBPATHS) \
   -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
@@ -3172,13 +3172,13 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc
 ifeq ($(LAZARUS_OPT),)
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
 else
-	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
+	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT)"
 endif
 idepkg: $(COMPILER_UNITTARGETDIR)
-	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
+	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)"
 bigide: $(COMPILER_UNITTARGETDIR) revisioninc
 	-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
-	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
+	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(OPT) $(BIG_IDE_OPTIONS)"
 starter: $(COMPILER_UNITTARGETDIR)
 ifeq ($(LAZARUS_OPT),)
 	$(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT)
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index 3a06aa9ccf..979b1c44ba 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -84,7 +84,7 @@ export LAZARUS_CONFIG_DIR
 
 #
 # idemake.cfg
-LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
+LAZARUS_IDE_CONFIG='$(LAZARUS_CONFIG_DIR)/idemake.cfg'
 LAZARUS_OPT=$(LAZARUS_LIBPATHS)
 
 #
@@ -134,17 +134,17 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc
 ifeq ($(LAZARUS_OPT),)
         $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
 else
-        $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
+        $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT)"
 endif
 
 #-----------------------------------------------------------------------------
 idepkg: $(COMPILER_UNITTARGETDIR)
-        $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
+        $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)"
 
 #-----------------------------------------------------------------------------
 bigide: $(COMPILER_UNITTARGETDIR) revisioninc
         -$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
-        $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
+        $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(OPT) $(BIG_IDE_OPTIONS)"
 
 #-----------------------------------------------------------------------------
 starter: $(COMPILER_UNITTARGETDIR)
diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index 2046755c3e..31bc38b7c3 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -525,7 +525,7 @@ begin
       MakeIDECfgFilename:=GetMakeIDEConfigFilename;
       if (FileExists(MakeIDECfgFilename)) then begin
         if pos(' ', MakeIDECfgFilename)>0 then
-          ExtraOptions:='@"'+MakeIDECfgFilename+'"'
+          ExtraOptions:='@'''+MakeIDECfgFilename+''''
         else
           ExtraOptions:='@'+MakeIDECfgFilename;
         exit;