diff --git a/collects/mred/private/wx/platform.rkt b/collects/mred/private/wx/platform.rkt
index 14d6f126f2..2e0678978d 100644
--- a/collects/mred/private/wx/platform.rkt
+++ b/collects/mred/private/wx/platform.rkt
@@ -3,10 +3,14 @@
 (provide (all-defined-out))
 
 (define-runtime-path platform-lib
-  (case (system-type)
-    [(#;windows) '(lib "mred/private/wx/win32/platform.rkt")]
-    [(macosx) '(lib "mred/private/wx/cocoa/platform.rkt")]
-    [(windows unix) '(lib "mred/private/wx/gtk/platform.rkt")]))
+  (let ([gtk-lib
+         '(lib "mred/private/wx/gtk/platform.rkt")])
+    (case (system-type)
+      [(windows) (if (getenv "PLT_WIN_GTK")
+                     gtk-lib
+                     '(lib "mred/private/wx/win32/platform.rkt"))]
+      [(maxcosx) '(lib "mred/private/wx/cocoa/platform.rkt")]
+      [(unix) gtk-lib])))
 
 (define-values (button%
                 canvas%
diff --git a/src/gracket/get-libs.rkt b/src/gracket/get-libs.rkt
index bead79b88e..79a58b21a0 100644
--- a/src/gracket/get-libs.rkt
+++ b/src/gracket/get-libs.rkt
@@ -58,27 +58,31 @@
           ["libpng14.14.dylib" 192224]
           ["PSMTabBarControl.tgz" 107171])])]
     [(windows)
-     '(["freetype6.dll" 535264]
-       ["libgobject-2.0-0.dll" 316586]
-       ["libatk-1.0-0.dll" 153763]
-       ["libgtk-win32-2.0-0.dll" 4740156]
-       ["libcairo-2.dll" 921369]
-       ["libjpeg-7.dll" 233192]
-       ["libexpat-1.dll" 143096]
-       ["libpango-1.0-0.dll" 336626]
-       ["libfontconfig-1.dll" 279059]
-       ["libpangocairo-1.0-0.dll" 95189]
-       ["libgdk-win32-2.0-0.dll" 827670]
-       ["libpangoft2-1.0-0.dll" 679322]
-       ["libgdk_pixbuf-2.0-0.dll" 252150]
-       ["libpangowin32-1.0-0.dll" 102210]
-       ["libgio-2.0-0.dll" 669318]
-       ["libpng14-14.dll" 219305]
-       ["libglib-2.0-0.dll" 1110713]
-       ["libwimp.dll" 69632]
-       ["libgmodule-2.0-0.dll" 31692]
-       ["zlib1.dll" 55808]
-       ["gtkrc" 1181])]))
+     (let ([basic '(["libjpeg-7.dll" 233192]
+                    ["libcairo-2.dll" 921369]
+                    ["libpango-1.0-0.dll" 336626]
+                    ["libexpat-1.dll" 143096]
+                    ["libpng14-14.dll" 219305]
+                    ["zlib1.dll" 55808]
+                    ["freetype6.dll" 535264]
+                    ["libfontconfig-1.dll" 279059]                    
+                    ["libglib-2.0-0.dll" 1110713]
+                    ["libgobject-2.0-0.dll" 316586]
+                    ["libgmodule-2.0-0.dll" 31692]
+                    ["libpangocairo-1.0-0.dll" 95189]
+                    ["libpangowin32-1.0-0.dll" 102210]
+                    ["libpangoft2-1.0-0.dll" 679322])])
+       (if (getenv "PLT_WIN_GTK")
+           (append
+            basic
+            '(["libatk-1.0-0.dll" 153763]
+              ["libgtk-win32-2.0-0.dll" 4740156]
+              ["libgdk-win32-2.0-0.dll" 827670]
+              ["libgdk_pixbuf-2.0-0.dll" 252150]
+              ["libgio-2.0-0.dll" 669318]
+              ["libwimp.dll" 69632]
+              ["gtkrc" 1181]))
+           basic))]))
 
 (define explained? #f)
 
diff --git a/src/worksp/gc2/make.rkt b/src/worksp/gc2/make.rkt
index 2f7a0528e5..782dc25bb8 100644
--- a/src/worksp/gc2/make.rkt
+++ b/src/worksp/gc2/make.rkt
@@ -311,6 +311,7 @@
 	    '("libracket3mxxxxxxx.dll")
 	    '("delayimp.lib")
 	    exe "" #t))
+(system- "mt.exe -manifest ../../../Racket.exe.manifest -outputresource:../../../Racket.exe;1")
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -343,6 +344,7 @@
 	    '("advapi32.lib" 
 	      "delayimp.lib") 
 	    "../../../GRacket.exe" " /subsystem:windows" #t))
+(system- "mt.exe -manifest ../../../GRacket.exe.manifest -outputresource:../../../GRacket.exe;1")
 
 (system- "cl.exe /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj")
 (system- "lib.exe -def:../../racket/dynsrc/mzdyn.def -out:mzdyn3m.lib")
diff --git a/src/worksp/gracket/gracket.manifest b/src/worksp/gracket/gracket.manifest
index 66d3bd16e6..c552066a04 100644
--- a/src/worksp/gracket/gracket.manifest
+++ b/src/worksp/gracket/gracket.manifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
 <assemblyIdentity 
 version="5.0.2.1" 
diff --git a/src/worksp/racket/racket.manifest b/src/worksp/racket/racket.manifest
index d4b2cf78f7..8b66585a1d 100644
--- a/src/worksp/racket/racket.manifest
+++ b/src/worksp/racket/racket.manifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
 <assemblyIdentity 
 version="5.0.1.6"