diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh
index 357692a..d18aa1f 100755
--- a/scripts/run_oldconfig.sh
+++ b/scripts/run_oldconfig.sh
@@ -254,6 +254,9 @@ scripts="${prefix}scripts"
 if test -e "${prefix}rpm/config.sh"; then
 	source "$_"
 fi
+if [ "$VARIANT" = "-vanilla" ] ; then
+    VANILLA_ONLY=1
+fi
 if test -z "$set_flavor" && test "$VANILLA_ONLY" = 1 -o -e .is_vanilla; then
 	set_flavor=vanilla
 fi