diff --git a/package/base/alsa-driver/alsa-driver.conf b/package/base/alsa-driver/alsa-driver.conf
index b669a2fc6..d1a69b11a 100644
--- a/package/base/alsa-driver/alsa-driver.conf
+++ b/package/base/alsa-driver/alsa-driver.conf
@@ -20,11 +20,20 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/base/linux/kernelversion.sh
+# . $base/package/base/linux/kernelversion.sh
+
+# map the driver mainline (24 or 26) to a kernel source and module directory
+kernelversion=""
+alsa_lx_ver="${xpkg#$pkg-}"
+lx_vers="`grep "^\[V\]" $base/package/base/linux/linux.desc | cut -f2 -d' '`"
+for lx_ver in $lx_vers ; do
+	[ "$alsa_lx_ver" == "${lx_ver:0:1}${lx_ver:2:1}" ] && kernelversion="$lx_ver-rock"
+done
 
 var_append confopt ' ' '--with-oss=yes --with-cards=all --with-sequencer=yes'
 var_append confopt ' ' "--with-isapnp=yes --with-moddir=$root/lib/modules/$kernelversion/alsa"
-var_append confopt ' ' "--with-kernel=$root/usr/src/linux"
+
+var_append confopt ' ' "--with-kernel=$root/usr/src/linux-$kernelversion"
 
 [ "$arch" = "powerpc" ] &&
 	hook_add premake 1 "sed -i -e 's,\(CONFIG_SND_INTERWAVE.*\)=m,\1=n,' \
@@ -32,7 +41,9 @@ var_append confopt ' ' "--with-kernel=$root/usr/src/linux"
 		-e 's,CONFIG_SND_HDSP=m,CONFIG_SND_HDSP=n,' \
 		-e 's,CONFIG_SND_RME9652=m,CONFIG_SND_RME9652=n,' toplevel.config"
 
-# otherwise alsa installs other crap like an init scrpit ...
-makeinstopt="$makeopt install-modules install-headers"
-postmake="$postmake cp -r utils/alsasound snddevices $docdir && rm -f $root/usr/src/linux/.tmp_gas_check"
-
+# otherwise alsa installs other crap like an init script ...
+makeinstopt="$makeopt install-modules"
+[ "$ROCKCFG_PKG_LINUX_DEFAULT" == "linux$alsa_lx_ver" ] && \
+	var_append makeinstopt " " "install-headers"
+postmake="$postmake cp -r utils/alsasound snddevices $docdir && \
+	rm -f $root/usr/src/linux-$kernelversion/.tmp_gas_check"
diff --git a/package/base/alsa-driver/alsa-driver.desc b/package/base/alsa-driver/alsa-driver.desc
index 22879f2d4..e1b4bb602 100644
--- a/package/base/alsa-driver/alsa-driver.desc
+++ b/package/base/alsa-driver/alsa-driver.desc
@@ -42,8 +42,8 @@
 
 [L] GPL
 [S] Stable
-[V] 1.0.10 0
+[V] 1.0.11rc4 0
 [P] X -?---5---9 122.800
 
-[D] 1766069851 alsa-driver-1.0.10.tar.bz2 ftp://ftp.alsa-project.org/pub/driver/
+[D] 2023761666 alsa-driver-1.0.11rc4.tar.bz2 ftp://ftp.alsa-project.org/pub/driver/
 
diff --git a/package/base/alsa-driver/pkg_config_linux.in b/package/base/alsa-driver/pkg_config_linux.in
new file mode 100644
index 000000000..61f23a3ff
--- /dev/null
+++ b/package/base/alsa-driver/pkg_config_linux.in
@@ -0,0 +1,10 @@
+pkgfork alsa-driver alsa-driver-24
+pkgfork alsa-driver alsa-driver-26
+
+if [ "$ROCKCFG_PKG_LINUX_SRC24" = 0 ]; then
+	pkgdisable alsa-driver=alsa-driver-24
+fi
+if [ "$ROCKCFG_PKG_LINUX_SRC26" = 0 ]; then
+	pkgdisable alsa-driver=alsa-driver-26
+fi
+pkgremove alsa-driver
diff --git a/package/base/alsa-driver/pkgmapper.in b/package/base/alsa-driver/pkgmapper.in
new file mode 100644
index 000000000..c716c5644
--- /dev/null
+++ b/package/base/alsa-driver/pkgmapper.in
@@ -0,0 +1,3 @@
+case $xpkg in
+	alsa-driver-24|alsa-driver-26) pkg=alsa-driver ;;
+esac