diff --git a/racket/src/worksp/csbuild.rkt b/racket/src/worksp/csbuild.rkt
index 8a2c94f2ac..f0e1673019 100644
--- a/racket/src/worksp/csbuild.rkt
+++ b/racket/src/worksp/csbuild.rkt
@@ -208,6 +208,13 @@
           (build-path scheme-dir machine "boot" machine)
           "../build/racket.boot")
 
+(system*! "mt"
+	  "-manifest" "racket/racket.manifest"
+	  (format "-outputresource:../../Racket~a.exe;1" cs-suffix))
+(system*! "mt"
+	  "-manifest" "gracket/gracket.manifest"
+	  (format "-outputresource:../../GRacket~a.exe;1" cs-suffix))
+
 ;; ----------------------------------------
 ;; Finish installation with "mzstart", "mrstart", and other
 ;; implementation-independent details as in "build.bat"
diff --git a/racket/src/worksp/gracket/gracket.manifest b/racket/src/worksp/gracket/gracket.manifest
index 9214662e04..fc0be37598 100644
--- a/racket/src/worksp/gracket/gracket.manifest
+++ b/racket/src/worksp/gracket/gracket.manifest
@@ -8,6 +8,20 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows Vista -->
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+        </application>
+    </compatibility>
   <dependency>
     <dependentAssembly>
       <assemblyIdentity type="win32"
diff --git a/racket/src/worksp/racket/racket.manifest b/racket/src/worksp/racket/racket.manifest
index 9214662e04..fc0be37598 100644
--- a/racket/src/worksp/racket/racket.manifest
+++ b/racket/src/worksp/racket/racket.manifest
@@ -8,6 +8,20 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows Vista -->
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+        </application>
+    </compatibility>
   <dependency>
     <dependentAssembly>
       <assemblyIdentity type="win32"