diff -u -b -B -r1.161 kernel-2.eclass
--- kernel-2.eclass	28 Feb 2006 02:56:47 -0000	1.161
+++ kernel-2.eclass	1 Mar 2006 19:10:30 -0000
@@ -996,6 +992,7 @@
 }
 
 kernel-2_pkg_setup() {
+	ABI=${KERNEL_ABI}
 	[[ ${ETYPE} == headers ]] && setup_headers
 	[[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..."
 }
diff -u -b -B -r1.58 linux-mod.eclass
--- linux-mod.eclass		8 Feb 2006 12:57:52 -0000	1.58
+++ linux-mod.eclass		1 Mar 2006 19:10:31 -0000
@@ -79,7 +79,7 @@
 #						documents for $modulename
 
 
-inherit linux-info
+inherit linux-info multilib
 EXPORT_FUNCTIONS pkg_setup pkg_postinst src_install src_compile pkg_postrm
 
 IUSE="" # don't put pcmcia here, rather in the ebuilds that actually support pcmcia
@@ -462,6 +463,7 @@
 	check_kernel_built;
 	check_modules_supported;
 	set_kvobj;
+	ABI=${KERNEL_ABI}
 	# Commented out with permission from johnm until a fixed version for arches
 	# who intentionally use different kernel and userland compilers can be
 	# introduced - Jason Wever <weeve@gentoo.org>, 23 Oct 2005
diff -u -b -B -r1.47 multilib.eclass
--- multilib.eclass	7 Jan 2006 04:40:45 -0000	1.47
+++ multilib.eclass	1 Mar 2006 19:10:31 -0000
@@ -102,6 +102,7 @@
 export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
 export LIBDIR_default=${CONF_LIBDIR:-"lib"}
 export CDEFINE_default="__unix__"
+export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
 
 # has_multilib_profile()
 has_multilib_profile() {