diff --git a/windows/src/buildtools/devtools/Makefile b/windows/src/buildtools/devtools/Makefile
index 0c6df7a67f..70d94bc908 100644
--- a/windows/src/buildtools/devtools/Makefile
+++ b/windows/src/buildtools/devtools/Makefile
@@ -18,7 +18,13 @@ build: dirs
     # build with DCC32 as $DCC32 command uses devtools.exe...
     # $(DCC32) devtools.dpr
 !IFDEF DELPHI_STARTER
-    start /wait $(MAKEDIR)\bds.exe -ns -b devtools.dpr
+    # We have a catch-22. We use devtools to do a build of devtools
+    # because otherwise Delphi IDE can stall with a spurious 'changed
+    # files' confirmation. So first use a static copy of devtools to
+    # kick things off, then replace it with a new copy once done.
+    # What a silly world we live in :)
+    copy devtools.bin $(PROGRAM)\buildtools\devtools.exe
+    $(DCC32) devtools.dpr
 !ELSE
     $(MAKEDIR)\dcc32 -Q -B -E. -NSVcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Web;Soap;Winapi;System.Win devtools.dpr
 !ENDIF
diff --git a/windows/src/buildtools/devtools/devtools.bin b/windows/src/buildtools/devtools/devtools.bin
new file mode 100644
index 0000000000..d73085629b
Binary files /dev/null and b/windows/src/buildtools/devtools/devtools.bin differ