diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 471a10cc39e..2ead4a75464 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -266,10 +266,28 @@ EOF
 	'' | 0* | *[!0-9]*) num_cpus=1;;
       esac
     fi
+    enable_langs=c,c++,lto
+    if [ -f ${SOURCE_DIRECTORY}/gcc/m2/Make-lang.in ]; then
+      enable_langs=$enable_langs,m2
+    fi
     contrib/gcc_build -d ${SOURCE_DIRECTORY} -o ${OBJECT_DIRECTORY} \
-      -c "--enable-languages=default,cobol --enable-generated-files-in-srcdir --disable-multilib" \
+      -c "--enable-languages=$enable_langs --enable-generated-files-in-srcdir --disable-multilib" \
       -m "-j$num_cpus" build || \
       error "Could not rebuild GCC"
+    cd ${OBJECT_DIRECTORY}/gcc
+    all_languages=`sed -n -e '/"all_languages"/s/^.*=//p' config.status \
+		   | sed -e 's/"//g'`
+    for lang in $all_languages; do
+      make $lang.srcextra $lang.srcinfo $lang.srcman || \
+	error "Could not build GCC $lang source extras"
+    done
+    if [ -d ${SOURCE_DIRECTORY}/libffi/doc ]; then
+      makeinfo --split-size=5000000  -I ${SOURCE_DIRECTORY}/gcc/doc/include \
+	-I ${SOURCE_DIRECTORY}/libffi/doc/ -o ${SOURCE_DIRECTORY}/libffi/doc/libffi.info \
+	${SOURCE_DIRECTORY}/libffi/doc/libffi.texi || \
+	error "Could not build libffi.info"
+    fi
+    cd ${SOURCE_DIRECTORY}
   fi
 
   # Move message catalogs to source directory.