diff --git a/Makefile.am b/Makefile.am
index a30a5df2a8..cc652844a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -976,35 +976,25 @@ package-win32-base-debug-7zip: package-win32-base-debug
 # Create package
 	7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
 
-package-win32-exe: package-win32-base package-win32-base-exe
-# Clean up
+package-win32-cleanup:
 	rm -Rf $(win32_destdir)
+	rm -Rf $(win32_debugdir)
 
-package-win32-zip: package-win32-base-zip
-# Clean up
-	rm -Rf $(win32_destdir)
+package-win32-exe: package-win32-base package-win32-base-exe package-win32-cleanup
 
-package-win32-debug-zip: package-win32-base-debug-zip
-# Clean up
-	rm -Rf $(win32_destdir)
+package-win32-zip: package-win32-base-zip package-win32-cleanup
 
-package-win32-7zip: package-win32-base-7zip
-# Clean up
-	rm -Rf $(win32_destdir)
+package-win32-debug-zip: package-win32-base-debug-zip package-win32-cleanup
 
-package-win32-debug-7zip: package-win32-base-debug-7zip
-# Clean up
-	rm -Rf $(win32_destdir)
+package-win32-7zip: package-win32-base-7zip package-win32-cleanup
+
+package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup
 
 package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe 
 
-package-win32: package-win32-no-clean
-# Clean up
-	rm -Rf $(win32_destdir)
+package-win32: package-win32-no-clean package-win32-cleanup
 
-package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
-# Clean up
-	rm -Rf $(win32_destdir)
+package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup
 
 #######
 # WinCE
@@ -1016,9 +1006,7 @@ package-wince-base-zip: package-wince-base
 	rm -f -- vlc-$(VERSION)-wince.zip
 	zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
 
-package-wince: package-wince-base-zip
-# Clean up
-	rm -Rf $(win32_destdir)
+package-wince: package-wince-base-zip package-win32-cleanup
 
 
 #####################################################################