--- sys-apps/module-init-tools/files/modules-update	2007-02-04 00:36:33.000000000 +0100
+++ sys-apps/module-init-tools/files/modules-update	2007-02-04 11:28:28.000000000 +0100
@@ -395,6 +395,18 @@
 }
 depfile=$(grab_depfile)
 
+ARCH=$(/bin/uname -m)
+case "${ARCH}" in
+	i?86)
+		ARCH="x86"
+	;;
+	mips|mips64)
+		ARCH="mips"
+	;;
+		*)
+	;;
+esac
+
 if [[ -d ${depfile%/*} ]] ; then
 	if [[ ${CFG_NEW_FILE} -nt ${depfile} ]] ; then
 		ebegin "Updating modules.dep"
@@ -402,7 +414,7 @@
 		           /boot /usr/src/linux ""
 		do
 			cfg="${cfg}/System.map"
-			for suffix in -genkernel-${KV} -${KV} "" ; do
+			for suffix in -genkernel-${ARCH}-${KV} -${KV} "" ; do
 				[[ -f ${cfg}${suffix} ]] && cfg="${cfg}${suffix}" && break 2
 			done
 		done