diff --git a/Config.in b/Config.in
index ce226e09f4..34d82492e7 100644
--- a/Config.in
+++ b/Config.in
@@ -80,14 +80,22 @@ menuconfig DEVEL
 	select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
-	bool "Show broken platforms / packages" if DEVEL
+	bool
+	prompt "Show broken platforms / packages" if DEVEL
 	default n
 
 config LOCALMIRROR
-	string "Local mirror for source packages" if DEVEL
+	string
+	prompt "Local mirror for source packages" if DEVEL
 
 menuconfig BUILDOPTS
-	bool "Build Options" if DEVEL
+	bool
+	prompt "Build Options" if DEVEL
+
+config CLEAN_IPKG
+	bool
+	prompt "Clean all ipkg files before building the rootfs" if BUILDOPTS
+	default n
 
 config AUTOREBUILD
 	bool
diff --git a/package/Makefile b/package/Makefile
index aa059a7d23..1df4537dba 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -35,6 +35,7 @@ $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
 	@-find $(TARGET_DIR) -name CVS   | $(XARGS) rm -rf
 	@-find $(TARGET_DIR) -name .svn  | $(XARGS) rm -rf
 	@-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
+	$(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/ipkg)
 
 $(curdir)/index: FORCE
 	@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)