diff --git a/package/avm/btsco/btsco.conf b/package/avm/btsco/btsco.conf
index 6aeb3bb4f..bc50291d3 100644
--- a/package/avm/btsco/btsco.conf
+++ b/package/avm/btsco/btsco.conf
@@ -20,6 +20,15 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+. $base/package/base/linux/kernelversion.sh
+
+add_wrapper uname <<- EOT
+	if [ "\$*" = "-r" ]; then
+		echo "$kernelversion"
+		exit 0
+	fi
+	exec \$orig "\$@"
+EOT
 
 # this needs the option CONFIG_SND_USB_USX2Y set so snd-hwdep.ko is built!
 btsco_kernelmodules() {
diff --git a/package/avm/hostap/hostap.conf b/package/avm/hostap/hostap.conf
index c001fff56..5a870838d 100644
--- a/package/avm/hostap/hostap.conf
+++ b/package/avm/hostap/hostap.conf
@@ -20,6 +20,16 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+. $base/package/base/linux/kernelversion.sh
+
+add_wrapper uname <<- EOT
+	if [ "\$*" = "-r" ]; then
+		echo "$kernelversion"
+		exit 0
+	fi
+	exec \$orig "\$@"
+EOT
+
 hostap_postmake()
 {
 	if basename $PWD | egrep -q "(hostapd|hostap-util)"; then
diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 1f26435f2..1e31a0c3a 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -482,10 +482,13 @@ main_lx() {
 		do [ -f $x ] && add_flist $x; done
 	fi
 
-	# fix /lib/modules/${ver}/build symlink
+	# fix /lib/modules/${ver}/{build,source} symlinks
 	rm -f $root/lib/modules/${lx_kernelrelease}/build
+	rm -f $root/lib/modules/${lx_kernelrelease}/source
 	ln -sf ../../../usr/src/linux-${lx_kernelrelease} \
 	       $root/lib/modules/${lx_kernelrelease}/build
+	ln -sf ../../../usr/src/linux-${lx_kernelrelease} \
+	       $root/lib/modules/${lx_kernelrelease}/source
 
 	if [ "$default" ] ; then
 		cp $confdir/mkinitrd.sh $root/sbin/mkinitrd
diff --git a/package/hannes/ipw2200/ipw2200.conf b/package/hannes/ipw2200/ipw2200.conf
index 5b9a0eee3..976d3f5b7 100644
--- a/package/hannes/ipw2200/ipw2200.conf
+++ b/package/hannes/ipw2200/ipw2200.conf
@@ -20,6 +20,17 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+. $base/package/base/linux/kernelversion.sh
+
+add_wrapper uname <<- EOT
+	if [ "\$*" = "-r" ]; then
+		echo "$kernelversion"
+		exit 0
+	fi
+	exec \$orig "\$@"
+EOT
+
+
 ipw2200_pm ()
 {
 	sed -i '/depmod/d' Makefile