diff --git a/target/bootdisk/build_stage2.sh b/target/bootdisk/build_stage2.sh
index 96970aae3..bb767a8f3 100644
--- a/target/bootdisk/build_stage2.sh
+++ b/target/bootdisk/build_stage2.sh
@@ -8,7 +8,9 @@ cd $disksdir/2nd_stage
 mkdir -p mnt/source mnt/target
 #
 package_map='       +00-dirtree         +glibc22            +glibc23
--automake17         -automake18         -automake19         -gcc34
+-automake17         -automake18         -automake19         -gcc2
+-gcc33              -gcc34              -gcc40              -gcc41
+-gmp
 -linux24-source     -linux26-header     -linux24            +udev
 -linux26-source     -linux26-header     -linux26            -postinstall
 -binutils           -bin86              -nasm               -dietlibc
diff --git a/target/bootdisk/config.in b/target/bootdisk/config.in
index 00ddf3cac..94357b965 100644
--- a/target/bootdisk/config.in
+++ b/target/bootdisk/config.in
@@ -42,6 +42,7 @@ pkgfilter sed '
 / linux /	{ p; d; };	/ ddrescue /    { p; d; };
 / iproute2 /	{ p; d; };	/ wget /	{ p; d; };
 / kiss /	{ p; d; };	/ udev /	{ p; d; };
+/ gmp /		{ p; d; };
 
 
 # Select some packages explicitely (architectures)
diff --git a/target/rescue/build_stage2.sh b/target/rescue/build_stage2.sh
index 1d2851688..8e8dfb1ea 100644
--- a/target/rescue/build_stage2.sh
+++ b/target/rescue/build_stage2.sh
@@ -6,7 +6,8 @@ echo_header "Creating 2nd stage filesystem:"
 mkdir -p $disksdir/rescue_root ; cd $disksdir/rescue_root
 #
 package_map='       +00-dirtree         +glibc22            +glibc23
--gcc2               -gcc3               -gcc33 -gcc32       -gccx
+-gcc2               -gcc3               -gcc33              -gcc34
+-gcc40              -gcc41              -gmp
 -linux24-src        -linux26-src        -linux24benh-src
 -linux24-source
 -linux24-header     -linux26-header     -linux24benh-header
diff --git a/target/rescue/config.in b/target/rescue/config.in
index 49933fa38..fd3d4210d 100644
--- a/target/rescue/config.in
+++ b/target/rescue/config.in
@@ -64,7 +64,8 @@ pkgfilter sed '
 / xfsprogs /	{ p; d; };
 / kbd /		{ p; d; };	/ eject /	{ p; d; };
 / openssl /	{ p; d; };	/ openssh /	{ p; d; };
-/ ntfsprogs / { p; d; };
+/ ntfsprogs /	{ p; d; };
+/ gmp /		{ p; d; };
 
 # Select some packages explicitely (architectures)
 / bin86 /	{ p; d; };
@@ -80,7 +81,7 @@ pkgfilter sed '
 
 # Disable even more packages we do not need
 / gcc2 /	{ s/^X /O /p; d; };	/ joe /		{ s/^X /O /p; d; };
-/ gdbm /	{ s/^X /O /p; d; };	/ pam /         { s/^X /O /p; d; };
+/ gdbm /	{ s/^X /O /p; d; };	/ pam /		{ s/^X /O /p; d; };
 / pdksh /	{ s/^X /O /p; d; };	/ libelf /	{ s/^X /O /p; d; };
 / prelink /	{ s/^X /O /p; d; };	/ ccache /	{ s/^X /O /p; d; };
 / cracklib /	{ s/^X /O /p; d; };	/ hotplug /	{ s/^X /O /p; d; };
@@ -89,8 +90,8 @@ pkgfilter sed '
 / dietlibc /	{ s/^X /O /p; d; };
 / sysvinit /	{ s/^X /O /p; d; };
 / uml_utilities /	{ s/^X /O /p; d; };
-/ python /    { s/^X /O /p; d; };
-/ dmapi /    { s/^X /O /p; d; };
+/ python /	{ s/^X /O /p; d; };
+/ dmapi /	{ s/^X /O /p; d; };
 '
 if [[ $rockver = 2.0* ]] ; then
        pkgfilter sed '