diff --git a/debootstrap b/debootstrap
index ec3f47c..15064d0 100755
--- a/debootstrap
+++ b/debootstrap
@@ -513,13 +513,14 @@ if am_doing_phase second_stage; then
   fi
   if [ "${MIRRORS#http://}" != "$MIRRORS" ]; then
     setup_apt_sources $SUITE ${MIRRORS%% *}
-    mv_invalid_to ${MIRRORS%% *}
+    mv_invalid_to $SUITE ${MIRRORS%% *}
   else
     setup_apt_sources $SUITE $DEF_MIRROR
-    mv_invalid_to $DEF_MIRROR
+    mv_invalid_to $SUITE $DEF_MIRROR
   fi
   if [ "$EXTRA_SUITE" != "" ]; then
     setup_apt_sources $EXTRA_SUITE $EXTRA_MIRROR
+    mv_invalid_to $EXTRA_SUITE $EXTRA_MIRROR
   fi
 
   if [ -e $TARGET/debootstrap/debootstrap.log ]; then
diff --git a/functions b/functions
index 2c05da3..355451b 100644
--- a/functions
+++ b/functions
@@ -772,10 +772,11 @@ conditional_cp () {
 }
 
 mv_invalid_to () {
-  local m=$1
+  local suite=$1
+  local m=$2
   m=$(echo ${m#http://} | tr '/' '_' | sed 's/_*//')
   (cd $TARGET/$APTSTATE/lists
-   for a in debootstrap.invalid_*; do
+   for a in debootstrap.invalid_dists_$suite_*; do
      mv $a ${m}_${a#*_}
    done
   )