diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 6ce21aa37..493caa41a 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -160,7 +160,7 @@ endif
 all: eduke32$(EXESUFFIX) mapster32$(EXESUFFIX)
 
 eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)$(ENGINELIB)
-	$(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(JFAUDLIBS) $(LIBS) $(STDCPPLIB) -Wl,-Map=$@.map
+	$(CC) -o $@ $^ $(JFAUDLIBS) $(LIBS) $(STDCPPLIB) -Wl,-Map=$@.map
 	-rm eduke32.sym$(EXESUFFIX)
 	cp eduke32$(EXESUFFIX) eduke32.sym$(EXESUFFIX)
 	strip eduke32$(EXESUFFIX)
@@ -171,6 +171,10 @@ mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)$(EDITORLIB) $(EOBJ)$(ENGINELIB)
 	cp mapster32$(EXESUFFIX) mapster32.sym$(EXESUFFIX)
 	strip mapster32$(EXESUFFIX)
 
+duke3d_w32$(EXESUFFIX): $(OBJ)wrapper.$o
+	$(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ -Wl
+	strip duke3d_w32$(EXESUFFIX)
+
 include Makefile.deps
 
 .PHONY: enginelib editorlib
@@ -222,7 +226,7 @@ clean:
 ifeq ($(PLATFORM),DARWIN)
 	cd osx && xcodebuild -target All clean
 else
-	-rm -f $(OBJ)* eduke32$(EXESUFFIX) eduke32.sym$(EXESUFFIX) mapster32$(EXESUFFIX) mapster32.sym$(EXESUFFIX) core*
+	-rm -f $(OBJ)* eduke32$(EXESUFFIX) eduke32.sym$(EXESUFFIX) mapster32$(EXESUFFIX) mapster32.sym$(EXESUFFIX) core* duke3d_w32$(EXESUFFIX)
 endif
 
 veryclean: clean
diff --git a/polymer/eduke32/source/wrapper.c b/polymer/eduke32/source/wrapper.c
index 0ecd570d1..b34e06595 100755
--- a/polymer/eduke32/source/wrapper.c
+++ b/polymer/eduke32/source/wrapper.c
@@ -21,24 +21,22 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
     PROCESS_INFORMATION pi;
 
     ZeroMemory(&szFileName,sizeof(szFileName));
-
-    for(i=0;i<strlen(lpCmdLine);i++)
+    strcpy(sCmdLine,lpCmdLine);
+    for(i=0;i<(signed)strlen(sCmdLine);i++)
     {
-        if(lpCmdLine[i] == '-' && lpCmdLine[i+1] == 'n' && lpCmdLine[i+2] == 'e' && lpCmdLine[i+3] == 't')
+        if(sCmdLine[i] == '-' && sCmdLine[i+1] == 'n' && sCmdLine[i+2] == 'e' && sCmdLine[i+3] == 't')
         {
-            i += 5;
-            j = 0;
-            while(!ISWS(lpCmdLine[i]) && i<strlen(lpCmdLine))
+            j = 0,i += 5;
+            while(!sCmdLine[i] != ' ' && i<(signed)strlen(sCmdLine))
             {
-                szFileName[j] = lpCmdLine[i];
-                fprintf(fp,"%d %d\n",j,i);
-                if(lpCmdLine[i+1] == ' ' || lpCmdLine[i+1] == '\n' || lpCmdLine[i+1] == '\r')
+                szFileName[j] = sCmdLine[i];
+                if(sCmdLine[i+1] == ' ')
                     break;
                 j++,i++;
             }
             break;
         }
-        else CmdLine[i] = lpCmdLine[i];
+        else CmdLine[i] = sCmdLine[i];
     }
 
     if(szFileName[0])
@@ -47,11 +45,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
 
     szCmdLine = sCmdLine;
 
-    fprintf(fp,"EDuke32 wrapper for Dukester X v0.01\
-            \nCopyright (c) 2006 EDuke32 team\n\
-            \nArgs passed to wrapper: %s\
-            \nRancidmeat net filename: %s\
-            \nFinal command line: %s\n",lpCmdLine,szFileName,szCmdLine);
+    fprintf(fp,"EDuke32 wrapper for Dukester X v0.01\n");
+    fprintf(fp,"Copyright (c) 2006 EDuke32 team\n\n");
+    fprintf(fp,"Args passed to wrapper: %s\n",lpCmdLine);
+    fprintf(fp,"Final command line: %s",szCmdLine);
 
     fclose(fp);