diff --git a/autoport b/autoport
index 3738884..bd9bcb9 100755
--- a/autoport
+++ b/autoport
@@ -232,12 +232,20 @@ function find_requirements() {
 }
 
 fetch_repfiles() {
+   local u
+
    curl -f -L -s ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist -o $DATADIR/$PORT_REPOSITORY/srcpkglist ||
       echo "Warning: unable to fetch ${REPS_BASE_URL}/$PORT_REPOSITORY/srcpkglist"
    curl -f -L -s $PORT_REPOSITORY_DISTROMATIC_URL/sources-$BASE_ARCH -o $DATADIR/$PORT_REPOSITORY/sources-$BASE_ARCH ||
       echo "Warning: unable to fetch $PORT_REPOSITORY_DISTROMATIC_URL/sources-$BASE_ARCH"
    curl -f -L -s $PORT_REPOSITORY_DISTROMATIC_URL/builds-$TARGET_ARCH.sh -o $DATADIR/$PORT_REPOSITORY/builds-$TARGET_ARCH.sh ||
       echo "Error: unable to fetch $PORT_REPOSITORY_DISTROMATIC_URL/builds-$TARGET_ARCH.sh"
+   for u in ${AUTOPORT_UNSTAGE_ARCHS}; do
+      [ "$u" = "$TARGET_ARCH" ] && {
+         rm -f $DATADIR/$PORT_REPOSITORY/unstage.$TARGET_ARCH
+         return
+      }
+   done
    curl -f -L -s ${REPS_BASE_URL}/${PORT_REPOSITORY/-*}/unstage.$TARGET_ARCH -o $DATADIR/$PORT_REPOSITORY/unstage.$TARGET_ARCH ||
       echo "Error: unable to fetch ${REPS_BASE_URL}/${PORT_REPOSITORY/-*}/unstage.$TARGET_ARCH"
 }
@@ -440,7 +448,8 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
          else
             JOB_CURRENT_VERSION=
          fi
-         if [ "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" -o \
+         if [ ! -s $DATADIR/$PORT_REPOSITORY/unstage.${TARGET_ARCH} -o \
+              "`grep "^${JOB_CURRENT}$" /etc/autodist/unstage.${TARGET_ARCH} 2>/dev/null`" -o \
               "`grep "^${JOB_CURRENT}$" $DATADIR/$PORT_REPOSITORY/unstage.${TARGET_ARCH} 2>/dev/null`" ]; then
             echo -n "^ $JOB_CURRENT: "
             STAGEOPTS=
diff --git a/etc/autodist/config b/etc/autodist/config
index f5acd71..d7dda86 100644
--- a/etc/autodist/config
+++ b/etc/autodist/config
@@ -17,6 +17,7 @@ AUTOBUILD_SUCCESS_DAYS=3
 AUTODIST_REPOSITORY=devel-autodist
 AUTODIST_DELAYED_REPOSITORY=devel-future
 AUTODIST_REPOSITORIES=(devel devel-games devel-makedist devel-kernel devel-xorg devel-kde4 devel-autodist)
+AUTOPORT_UNSTAGE_ARCHS="i586"
 AUTOPORT_STAGEVARS="--define stage1=1"
 AUTOPORT_MAX_STEPS=10
 #RPMDIR=/usr/src/RPM