diff --git a/core/gcc/build b/core/gcc/build
index 13cedbf8..bcd18d12 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -12,7 +12,6 @@ export CXXFLAGS=-pipe
 
 ../gcc/configure \
     --prefix=/usr \
-    --disable-bootstrap \
     --disable-multilib \
     --disable-symvers \
     --disable-libmpx \
diff --git a/core/gcc/version b/core/gcc/version
index 761613dc..54041f29 100644
--- a/core/gcc/version
+++ b/core/gcc/version
@@ -1 +1 @@
-9.1.0 5
+9.1.0 6
diff --git a/core/gmp/build b/core/gmp/build
index 56c73e43..33a70581 100755
--- a/core/gmp/build
+++ b/core/gmp/build
@@ -8,6 +8,7 @@ cp -v configfsf.sub   config.sub
     --localstatedir=/var/state/gmp \
     --build="$(gcc -dumpmachine)" \
     --enable-cxx \
+    --enable-fat \
     --with-pic
 
 make
diff --git a/core/gmp/version b/core/gmp/version
index f15cc431..a660a1ad 100644
--- a/core/gmp/version
+++ b/core/gmp/version
@@ -1 +1 @@
-6.1.2 3
+6.1.2 4