diff --git a/build/clean.sh b/build/clean.sh
index 149d7de..c0b4ed9 100644
--- a/build/clean.sh
+++ b/build/clean.sh
@@ -62,6 +62,16 @@ for ARG in ${@}; do
 		echo ">>> Removing dvd image"
 		rm -f ${IMAGESDIR}/*-dvd-${PRODUCT_ARCH}.iso*
 		;;
+	hotfix)
+		echo ">>> Removing plugins and core from packages set"
+		setup_stage ${STAGEDIR}
+		setup_base ${STAGEDIR}
+		if extract_packages ${STAGEDIR}; then
+			remove_packages ${STAGEDIR} ${PRODUCT_CORES} \
+			    ${PRODUCT_PLUGINS}
+			bundle_packages ${STAGEDIR} '' plugins core
+		fi
+		;;
 	images)
 		setup_stage ${IMAGESDIR}
 		;;
diff --git a/composite/hotfix.sh b/composite/hotfix.sh
index 08b4b04..594a3a1 100644
--- a/composite/hotfix.sh
+++ b/composite/hotfix.sh
@@ -32,7 +32,7 @@ set -e
 
 if [ -z "${TARGET}" -o "${TARGET}" = "plugins" -o "${TARGET}" = "core" ]; then
 	# force a full rebuild of selected stage(s)
-	make clean-${TARGET:-"plugins,core"} packages
+	make clean-${TARGET:-"hotfix"} packages
 elif [ "${TARGET}" = "ports" ]; then
 	# force partial rebuild of out of date ports
 	make ports-${1} PORTSENV="MISMATCH=no ${PORTSENV}"
diff --git a/composite/nightly.sh b/composite/nightly.sh
index 9b06e19..5b5ee65 100644
--- a/composite/nightly.sh
+++ b/composite/nightly.sh
@@ -30,7 +30,7 @@ CONTINUE=
 STAGENUM=0
 
 if [ -n "${1}" ]; then
-	CLEAN=plugins,core
+	CLEAN=hotfix
 	CONTINUE=-nightly
 	PORTSENV="MISMATCH=no"
 fi