diff --git a/ChangeLog b/ChangeLog
index 6aeb177dc..8c777215e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.am: Allow STRIP to be empty when creating windowszip.
+
 2013-11-19  Axel Kellermann <axel.kellermann@gmx.de>
 
 	* util/grub.d/30_os-prober.in: Add GRUB_OS_PROBER_SKIP_LIST to
diff --git a/Makefile.am b/Makefile.am
index 1e3b25b3f..0293d2538 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -410,7 +410,8 @@ windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
 	test -d $(windowsdir)/themes || mkdir $(windowsdir)/themes
 	test -d $(windowsdir)/themes/starfield || mkdir $(windowsdir)/themes/starfield
 	for x in $(PROGRAMS); do \
-		$(STRIP) $$x -o $(windowsdir)/$$x; \
+		if [ x$(STRIP) != x ]; then $(STRIP) $$x -o $(windowsdir)/$$x; \
+		else cp -fp $$x $(windowsdir)/$$x; fi; \
 	done
 	for x in $(pkgdata_DATA); do \
 		cp -fp $$x $(windowsdir)/$$x; \