diff --git a/package/base/gcc/gcc.conf b/package/base/gcc/gcc.conf
index 4442b02a4..a1d0a03a2 100644
--- a/package/base/gcc/gcc.conf
+++ b/package/base/gcc/gcc.conf
@@ -353,8 +353,8 @@ gcc_cross() {
 	mkdir objdir ; cd objdir ; hook_eval preconf
 	eval ../configure --program-prefix=${pkg_gcc_target}- --disable-cpp \
 	                 --disable-shared --disable-multilib $confopt
-	make -C libiberty
-	if [ -d texinfo ] ; then make -C texinfo ; fi
+	if [ -d libiberty ]; then make -C libiberty; fi
+	if [ -d texinfo ]; then make -C texinfo; fi
 
 	hook_eval premake
 	if [ "$xpkg" = "gcc2" ] ; then
@@ -364,14 +364,22 @@ gcc_cross() {
 	else
 		# workaround for at least gcc-3.2.3
 		mkdir -p $root/$prefix/lib/${gcc_lib_dir}
-		make -C gcc all
-		hook_eval inmake
-		make -C gcc install
+		if [ -d gcc ]; then
+			make -C gcc all
+			hook_eval inmake
+			make -C gcc install
+		else
+			make all-gcc
+			hook_eval inmake
+			make install-gcc
+		fi
 	fi
 	hook_eval postmake
 
-	${pkg_gcc_target}-ranlib \
-		$root/$prefix/lib/${gcc_lib_dir}/libgcc.a
+	if [ -f $root/$prefix/lib/${gcc_lib_dir}/libgcc.a ]; then
+		${pkg_gcc_target}-ranlib \
+			$root/$prefix/lib/${gcc_lib_dir}/libgcc.a
+	fi
 
 	if [ "$stagelevel" -eq 0 ]; then
 		x="$root/$prefix/crosscc/${arch_target}"
diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 0c0b950cc..0d0999020 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -462,7 +462,10 @@ patchfiles="`ls $confdir/*.patch $confdir/*.patch.$arch \
 if [ $stagelevel -le 1 ]; then
 	patchfiles="`ls $patchfiles $confdir/*.patch.cross \
 	             $confdir/*.patch.cross.$arch 2>/dev/null | tr '\n' ' '`"
-	flistroot="$flistroot include share"
+fi
+if [ $stagelevel -eq 0 ]; then
+	flistroot="$flistroot include share doc info man"
+	flistroot="$flistroot crosscc wrapper $arch_target"
 fi
 
 if [ $stagelevel -gt 1 ]; then