diff --git a/build.sh b/build.sh
index 719f4fc..caf519f 100755
--- a/build.sh
+++ b/build.sh
@@ -176,6 +176,7 @@ if [ ! -f "$STEPS_DIR/gcc-step1" ]; then
         --disable-multilib            \
         --disable-threads             \
         --disable-libatomic           \
+        --disable-libmudflap          \
         --disable-libgomp             \
         --disable-libquadmath         \
         --disable-libquadmath-support \
@@ -288,14 +289,14 @@ if [ ! -f "$STEPS_DIR/glibc" ]; then
     touch "$STEPS_DIR/glibc"
 fi
 
-#unset CC
-#unset CXX
-#unset LD
-#unset AS
-#unset AR
-#unset RANLIB
-#unset OBJDUMP
-#export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_old"
+unset CC
+unset CXX
+unset LD
+unset AS
+unset AR
+unset RANLIB
+unset OBJDUMP
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_old"
 
 if [ ! -f "$STEPS_DIR/gcc-step2" ]; then
     #if [ ! -d "$LFS_BUILD/gcc/build" ]; then
@@ -309,34 +310,37 @@ if [ ! -f "$STEPS_DIR/gcc-step2" ]; then
     cd  build
 
     # ../configure is already done
-    #"../configure"                    \
-    #    --target=$LFS_TGT             \
-    #    --host=$(../config.guess)     \
-    #    --build=$(../config.guess)    \
-    #    --prefix=$LFS_TOOLS           \
-    #    --with-glibc-version=2.40     \
-    #    --with-sysroot=$LFS           \
-    #    --enable-default-pie          \
-    #    --enable-default-ssp          \
-    #    --disable-nls                 \
-    #    --disable-multilib            \
-    #    --disable-libatomic           \
-    #    --disable-libgomp             \
-    #    --disable-libquadmath         \
-    #    --disable-libquadmath-support \
-    #    --disable-libssp              \
-    #    --disable-libvtv              \
-    #    --disable-libstdcxx           \
-    #    --disable-decimal-float       \
-    #    --disable-libsanitizer        \
-    #    --enable-languages=c
+    "../configure"                    \
+        --target=$LFS_TGT             \
+        --host=$(../config.guess)     \
+        --build=$(../config.guess)    \
+        --prefix=$LFS_TOOLS           \
+        --with-glibc-version=2.40     \
+        --with-sysroot=$LFS           \
+        --enable-c99                  \
+        --enable-long-long            \
+        --enable-default-pie          \
+        --enable-default-ssp          \
+        --disable-nls                 \
+        --disable-multilib            \
+        --disable-libatomic           \
+        --disable-libmudflap          \
+        --disable-libgomp             \
+        --disable-libquadmath         \
+        --disable-libquadmath-support \
+        --disable-libssp              \
+        --disable-libvtv              \
+        --disable-libstdcxx           \
+        --disable-decimal-float       \
+        --disable-libsanitizer        \
+        --enable-languages=c
 
     # Repeat this
     #make -j 32 all-gcc
     #make -j 32 install-gcc
 #exit 0
-    make -j 32 all-target-libgcc # if build fails add --disable-libsanitizer
-    make -j 32 install-target-libgcc
+    make -j 32 # if build fails add --disable-libsanitizer
+    make -j 32 install
 
     cd "$BASE_DIR"
     #rm -rf "$LFS_BUILD/gcc/build" # Do not remove the whole gcc directory: we need it for libstdc++