--- mkinitrd-5.0.17/mkinitrd.uvesafb~	2009-01-06 00:42:27.899820655 +0100
+++ mkinitrd-5.0.17/mkinitrd	2009-01-06 00:45:05.550820433 +0100
@@ -727,13 +727,19 @@ if [ -n "$addfb" ]; then
         ;;
     *)
         # Ignore errors here -- we might be using legacy vesafb --> builtin
-        findmodule --noload -vesafb-tng
-	if echo $COPY_MODULES |grep -q vesafb-tng; then
-	    FBMOD="vesafb-tng"
-	    FBPARM="nocrtc=1 mode=$resolution"
-	else
-	    # Legacy built-in vesafb --> no modules needed
-	    addfb=""
+        findmodule --noload -uvesafb
+	if echo $COPY_MODULES |grep -q uvesafb; then
+            FBMOD="uvesafb"
+            FBPARM="nocrtc=1 mode_option=$resolution mtrr=3 pmipal=1"
+        else
+            findmodule --noload -vesafb-tng
+            if echo $COPY_MODULES |grep -q vesafb-tng; then
+	        FBMOD="vesafb-tng"
+	        FBPARM="nocrtc=1 mode=$resolution"
+	    else
+	        # Legacy built-in vesafb --> no modules needed
+	        addfb=""
+            fi
 	fi
         ;;
     esac
@@ -866,7 +872,7 @@ mkdir -p $MNTIMAGE/dev
 mkdir -p $MNTIMAGE/proc
 mkdir -p $MNTIMAGE/sys
 mkdir -p $MNTIMAGE/sysroot
-ln -s bin $MNTIMAGE/sbin
+mkdir -p $MNTIMAGE/sbin
 
 if [ -e /etc/fstab.sys ]; then
     inst /etc/fstab.sys "$MNTIMAGE/etc/fstab.sys"
@@ -874,6 +880,7 @@ fi
 inst /sbin/nash "$MNTIMAGE/bin/nash"
 inst /sbin/insmod.static "$MNTIMAGE/bin/insmod"
 ln -s /sbin/nash $MNTIMAGE/sbin/modprobe
+[ "$FBMOD" = "uvesafb" ] && inst /sbin/v86d "$MNTIMAGE/sbin/v86d"
 [ -n "$DYNAMIC_DEV" ] && ln -s /sbin/nash $MNTIMAGE/sbin/hotplug
 
 for MODULE in $COPY_MODULES; do
@@ -895,6 +902,7 @@ mknod $MNTIMAGE/dev/rtc c 10 135
 mknod $MNTIMAGE/dev/systty c 4 0
 mknod $MNTIMAGE/dev/tty c 5 0
 mknod $MNTIMAGE/dev/zero c 1 5
+mknod $MNTIMAGE/dev/mem c 1 1
 
 for i in `seq 0 12`; do
     mknod $MNTIMAGE/dev/tty$i c 4 $i