--- /tmp/gcc-config	2006-12-12 08:41:06.000000000 +0200
+++ /usr/bin/gcc-config	2006-12-12 06:57:54.000000000 +0200
@@ -249,15 +249,15 @@
 	umask 022
 	# Find the bin wrapper
 	local wrapper
-	for wrapper in GENTOO_LIBDIR lib lib64 lib32 lib ; do
+	for wrapper in lib lib lib64 lib32 lib ; do
 		wrapper="${ROOT}usr/${wrapper}/misc/gcc-config"
 		[[ -e ${wrapper} ]] && break
 	done
 
 	# Update the wrappers for this profile
-	local native="gcc cpp cc c++ g++ f77 g77 gcj"
+	local native="gcc cpp cc c++ g++ f77 g77 gcj gcjh gfortran"
 	is_cross_compiler && native=""
-	for x in ${native} ${CTARGET}-{cpp,gcc,c++,g++,f77,g77,gcj} ; do
+	for x in ${native} ${CTARGET}-{cpp,gcc,c++,g++,f77,g77,gcj,gcjh,gfortran} ; do
 		# Make sure we have no stale wrappers
 		${RM} -f "${ROOT}/usr/bin/${x}"
 		[[ ${x:${#x}-3} == "gcc" || ${x:${#x}-3} == "g++" ]] \