diff --git a/tools/install/win/RemovedFiles32.iss b/tools/install/win/RemovedFiles32.iss
index ae065e29e2..6c5286beeb 100644
--- a/tools/install/win/RemovedFiles32.iss
+++ b/tools/install/win/RemovedFiles32.iss
@@ -1217,6 +1217,11 @@ Name: {app}\lcl\units\i386-win32\qt\qtwsstdctrls.o; Type: files
 Name: {app}\lcl\units\i386-win32\qt\qtwsstdctrls.ppu; Type: files
 Name: {app}\lcl\units\i386-win32\win32\win32uxtheme.o; Type: files
 Name: {app}\lcl\units\i386-win32\win32\win32uxtheme.ppu; Type: files
+Name: {app}\mingw\bin\gdb.exe; Type: files
+Name: {app}\mingw\bin\libexpat-1.dll; Type: files
+Name: {app}\mingw\bin\libgcc_s_dw2-1.dll; Type: files
+Name: {app}\mingw\bin\libiconv-2.dll; Type: files
+Name: {app}\mingw\bin\libintl-8.dll; Type: files
 Name: {app}\packager\adddirtopkgdlg.lrs; Type: files
 Name: {app}\packager\addfiletoapackagedlg.lrs; Type: files
 Name: {app}\packager\addtopackagedlg.lrs; Type: files
diff --git a/tools/install/win/RemovedFiles64.iss b/tools/install/win/RemovedFiles64.iss
index bb0a27a5a6..519f43af79 100644
--- a/tools/install/win/RemovedFiles64.iss
+++ b/tools/install/win/RemovedFiles64.iss
@@ -1217,6 +1217,8 @@ Name: {app}\lcl\units\x86_64-win64\qt\qtwsstdctrls.o; Type: files
 Name: {app}\lcl\units\x86_64-win64\qt\qtwsstdctrls.ppu; Type: files
 Name: {app}\lcl\units\x86_64-win64\win32\win32uxtheme.o; Type: files
 Name: {app}\lcl\units\x86_64-win64\win32\win32uxtheme.ppu; Type: files
+Name: {app}\mingw\bin\gdb.exe; Type: files
+Name: {app}\mingw\bin\libiconv-2.dll; Type: files
 Name: {app}\packager\adddirtopkgdlg.lrs; Type: files
 Name: {app}\packager\addfiletoapackagedlg.lrs; Type: files
 Name: {app}\packager\addtopackagedlg.lrs; Type: files
diff --git a/tools/install/win/create_installer.bat b/tools/install/win/create_installer.bat
index c32240ea8a..51a4442171 100644
--- a/tools/install/win/create_installer.bat
+++ b/tools/install/win/create_installer.bat
@@ -123,7 +123,10 @@ if not exist %BUILDDIR%\lazarus.exe goto END
 if not exist %BUILDDIR%\startlazarus.exe goto END
 
 :: copy gdb into build dir
-if exist %GDBDIR% %SVN% export -q %GDBDIR% %BUILDDIR%\mingw
+if NOT exist %GDBDIR% goto NOGDB
+gmkdir -p %BUILDDIR%\mingw
+%SVN% export -q %GDBDIR% %BUILDDIR%\mingw\%FPCFULLTARGET%
+:NOGDB
 
 :: create the installer
 IF [%BUILDLAZRELEASE%]==[] GOTO SNAPSHOT
diff --git a/tools/install/win/environmentoptions.xml b/tools/install/win/environmentoptions.xml
index 50cd482fe5..cc38ed9c70 100644
--- a/tools/install/win/environmentoptions.xml
+++ b/tools/install/win/environmentoptions.xml
@@ -13,7 +13,7 @@
     <TestBuildDirectory Value="%Temp%">
     </TestBuildDirectory>
     <Debugger Class="TGDBMIDebugger"/>
-    <DebuggerFilename Value="%LazDir%\mingw\bin\gdb.exe">
+    <DebuggerFilename Value="%LazDir%\mingw\$(TargetCPU)-$(TargetOS)\bin\gdb.exe">
     </DebuggerFilename>
   </EnvironmentOptions>
 </CONFIG>