diff --git a/src/Makefile b/src/Makefile
index 71d0798c..7a48ad1f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -54,6 +54,7 @@ endif
 
 
 all: upx$(exeext)
+.DELETE_ON_ERROR: upx$(exeext) $(upx_OBJECTS)
 
 upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
 	$($(notdir $@).PRE_LINK_STEP)
diff --git a/src/stub/Makefile b/src/stub/Makefile
index 2b59316e..2a223525 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -714,6 +714,10 @@ $(STUBS): tmp/.tmp-stamp $(MAKEFILE_LIST)
 endif
 -include tmp/*.d
 
+ifneq ($(strip $(STUBS)),)
+.DELETE_ON_ERROR: $(STUBS)
+endif
+
 
 # /***********************************************************************
 # // extra-all