diff --git a/scripts/unpack b/scripts/unpack
index 4c34d7738f..28bd13bf37 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -183,16 +183,16 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
     post_patch
   fi
 
-  for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
-    if [ ! "$PKG_NAME" == "configtools" ] ; then
+  if [ ! "$PKG_NAME" == "configtools" ] ; then
+    for config in `find $PKG_BUILD -name config.guess | sed 's/config.guess//'`; do
       printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor}   $config\n" ' '
 
       [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \
         cp -f $TOOLCHAIN/configtools/config.guess $config
       [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \
         cp -f $TOOLCHAIN/configtools/config.sub $config
-    fi
-  done
+    done
+  fi
 fi
 
 if [ "$PKG_SECTION" != "virtual" ]; then