diff --git a/architecture/x86/kernel.conf.sh b/architecture/x86/kernel.conf.sh
index ec97974be..95b699215 100644
--- a/architecture/x86/kernel.conf.sh
+++ b/architecture/x86/kernel.conf.sh
@@ -68,6 +68,7 @@
 		dnl Other useful stuff
 		dnl
 		CONFIG_RTC=y
+		CONFIG_INPUT_JOYSTICK=y
 
 		include(`kernel-common.conf')
 		include(`kernel-scsi.conf')
diff --git a/package/base/sysfiles/stone_mod_setup.sh b/package/base/sysfiles/stone_mod_setup.sh
index 438067ce8..e0cf877bd 100644
--- a/package/base/sysfiles/stone_mod_setup.sh
+++ b/package/base/sysfiles/stone_mod_setup.sh
@@ -38,6 +38,7 @@ EOT
 	    if [ -e $x ] ; then
 		trg=/mnt/${x/*\//} ; trg=${trg/cdrom0/cdrom}
 		mkdir -p $trg
+		[ -L "$x" ] && x="`readlink -f $x`"
 		echo "$x $trg iso9660 ro,noauto 0 0" >> $tmp2
 	    fi
 	done
@@ -46,6 +47,7 @@ EOT
 	    if [ -e $x ] ; then
 		trg=/mnt/floppy${x/*\//} ; trg=${trg/floppy0/floppy}
 		mkdir -p $trg
+		[ -L "$x" ] && x="`readlink -f $x`"
 		echo "$x $trg auto sync,noauto 0 0" >> $tmp2
 	    fi
 	done