diff --git a/Tools/freeze/winmakemakefile.py b/Tools/freeze/winmakemakefile.py
index e9b391db5b1..dde241bddcb 100644
--- a/Tools/freeze/winmakemakefile.py
+++ b/Tools/freeze/winmakemakefile.py
@@ -25,10 +25,11 @@ def makemakefile(outfp, vars, files, target):
 def realwork(vars, files, target):
     print "# Makefile for Windows (NT or 95) generated by freeze.py script"
     print
-    print "target =", target
-    print "pythonhome =", vars['prefix']
+    print 'target = %s' % target
+    print 'pythonhome = "%s"' % vars['prefix']
     # XXX The following line is fishy and may need manual fixing
-    print "pythonlib =", vars['exec_prefix'] + "/pcbuild/release/python15.lib"
+    print 'pythonlib = "%s"' % (vars['exec_prefix'] +
+                                "/pcbuild/release/python15.lib")
     print "subsystem =", vars['subsystem']
     print
     print "all: $(target).exe"
@@ -39,11 +40,11 @@ def realwork(vars, files, target):
         base = os.path.basename(file)
         base, ext = os.path.splitext(base)
         objects.append(base + ".obj")
-        print "%s.obj: %s" % (base, file)
+        print '%s.obj: "%s"' % (base, file)
         print "\t$(CC) -c $(cdl)",
         print "-I$(pythonhome)/Include  -I$(pythonhome)/PC \\"
         print "\t\t$(cflags) $(cdebug) $(cinclude) \\"
-        print "\t\t", file
+        print '\t\t"%s"' % file
         print
 
     print "$(target).exe:",
@@ -54,6 +55,10 @@ def realwork(vars, files, target):
     print "\\"
     print "\t\t$(pythonlib) $(lcustom) shell32.lib comdlg32.lib wsock32.lib \\"
     print "\t\t-subsystem:$(subsystem) $(resources)"
+    print
+    print "clean:"
+    print "\t\t-rm *.obj"
+    print "\t\t-rm $(target).exe"
 
 # Local Variables:
 # indent-tabs-mode: nil