diff --git a/Makefile b/Makefile
index 80b805ef1f..50e6312fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -488,12 +488,12 @@ bundle-from-server:
 	rm -rf bundle
 	mkdir -p bundle/racket
 	$(RACKET) -l setup/unixstyle-install bundle racket bundle/racket
+	$(RACKET) -l setup/winstrip bundle/racket
+	$(RACKET) -l setup/winvers-change bundle/racket
 	$(RACKET) -l distro-build/unpack-collects http://$(SVR_PRT)/$(SERVER_COLLECTS_PATH)
 	$(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(REQUIRED_PKGS)
 	$(BUNDLE_RACO) pkg install $(REMOTE_INST_AUTO) $(PKG_SOURCE_MODE) $(PKGS)
 	$(RACKET) -l setup/unixstyle-install post-adjust "$(SOURCE_MODE)" "$(PKG_SOURCE_MODE)" racket bundle/racket
-	$(RACKET) -l setup/winstrip bundle/racket
-	$(RACKET) -l setup/winvers-change bundle/racket
 
 UPLOAD_q = --readme "$(README)" --upload "$(UPLOAD)" --desc "$(DIST_DESC)"
 DIST_ARGS_q = $(UPLOAD_q) $(RELEASE_MODE) $(SOURCE_MODE) $(VERSIONLESS_MODE) $(MAC_PKG_MODE) \
diff --git a/racket/collects/setup/winstrip.rkt b/racket/collects/setup/winstrip.rkt
index 4259f537ea..a1207c5fd8 100644
--- a/racket/collects/setup/winstrip.rkt
+++ b/racket/collects/setup/winstrip.rkt
@@ -39,6 +39,7 @@
                  (or (regexp-match? #rx#"[.](?i:pdb|ilk|manifest)$" b)
                      (regexp-match? #rx#"(?i:CGC[.](?:dll|exe))$" b)
                      (and (regexp-match? #rx#"(?i:[.](?:dll|exp|obj|lib|def))$" b)
+                          (regexp-match? #rx#"(?i:racket|mzgc)$" b)
                           (not (regexp-match? #rx#"3m" b))))))
       (delete-file* f)))