3 files changed, 20 insertions, 6 deletions
diff --git a/makefile.after b/makefile.after
index 49797e51c..d024b3456 100644
--- a/makefile.after
+++ b/makefile.after
@@ -3,7 +3,11 @@ OBJS:=$(OBJS:%.cc=$(OBJDIR)$/%$(OBJEXT))
 
 RESOBJS:=$(RESOURCES:%.rc=$(OBJDIR)$/%.res)
 
+ifeq ($(DEBUG),1)
+MANIFESTFILE:=$(MHMAKECONF)\runtime.debug.manifest
+else
 MANIFESTFILE:=$(MHMAKECONF)\runtime.manifest
+endif
 
 ifdef SUBDIRS
 load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
diff --git a/runtime.debug.manifest b/runtime.debug.manifest
new file mode 100644
index 000000000..dcc64c2a3
--- /dev/null
+++ b/runtime.debug.manifest
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.DebugCRT" version="9.0.30729.1" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b" />
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/runtime.manifest b/runtime.manifest
index 42c594257..e1888927c 100644
--- a/runtime.manifest
+++ b/runtime.manifest
@@ -9,12 +9,7 @@
   </trustInfo>
   <dependency>
     <dependentAssembly>
-      <assemblyIdentity type='win32' name='Microsoft.VC90.DebugCRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.1" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b" />
     </dependentAssembly>
   </dependency>
 </assembly>