diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk
index 08e73989..df4e7b2c 100644
--- a/make/buildsystem-helpers.mk
+++ b/make/buildsystem-helpers.mk
@@ -6,7 +6,7 @@
 # start-up build
 define STARTUP
 	@$(call MESSAGE,"Start-up build")
-	$(REMOVE)/$($(PKG)_DIR)
+	$(call CLEANUP)
 endef
 
 # -----------------------------------------------------------------------------
@@ -19,6 +19,18 @@ endef
 
 # -----------------------------------------------------------------------------
 
+# clean up
+define CLEANUP
+	$(Q)( \
+	if [ -d $(BUILD_DIR)/$($(PKG)_DIR) ]; then \
+		$(call MESSAGE,"Clean up"); \
+		rm -rf $(BUILD_DIR)/$($(PKG)_DIR); \
+	fi; \
+	)
+endef
+
+# -----------------------------------------------------------------------------
+
 define TOUCH
 	@touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
 endef
@@ -162,7 +174,7 @@ endef
 define HOST_FOLLOWUP
 	@$(call MESSAGE,"Follow-up build")
 	$(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
-	$(REMOVE)/$($(PKG)_DIR)
+	$(call CLEANUP)
 	$(foreach hook,$($(PKG)_HOST_FINALIZE_HOOKS),$(call $(hook))$(sep))
 	$(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
 	$(call TOUCH)
@@ -173,7 +185,7 @@ define TARGET_FOLLOWUP
 	$(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
 	$(call REWRITE_CONFIG_SCRIPTS)
 	$(call REWRITE_LIBTOOL)
-	$(REMOVE)/$($(PKG)_DIR)
+	$(call CLEANUP)
 	$(foreach hook,$($(PKG)_TARGET_FINALIZE_HOOKS),$(call $(hook))$(sep))
 	$(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
 	$(call TOUCH)
diff --git a/support/gnuconfig/gnuconfig-update.mk b/support/gnuconfig/gnuconfig-update.mk
index 6c45707b..6a4a747e 100644
--- a/support/gnuconfig/gnuconfig-update.mk
+++ b/support/gnuconfig/gnuconfig-update.mk
@@ -11,9 +11,9 @@ GNUCONFIG_SITE = https://git.savannah.gnu.org/git
 
 update-gnuconfig:
 ifeq ($(NI_ADMIN),true)
-	$(REMOVE)/$(GNUCONFIG_DIR)
+	$(call STARTUP)
 	$(GET_GIT_SOURCE) $(GNUCONFIG_SITE)/$(GNUCONFIG_SOURCE) $(BUILD_DIR)/$(GNUCONFIG_DIR)
 	$(INSTALL_EXEC) $(BUILD_DIR)/$(GNUCONFIG_DIR)/config.* support/gnuconfig
-	$(REMOVE)/$(GNUCONFIG_DIR)
+	$(call CLEANUP)
 	@$(call MESSAGE,"Commit your changes in support/gnuconfig")
 endif