diff --git a/makehdimage b/makehdimage
index 69670f3311..a41f9e91b5 100755
--- a/makehdimage
+++ b/makehdimage
@@ -64,15 +64,16 @@ BEOS_BIN="touch sync ln listarea listattr listsem listport \
 	isvolume shutdown safemode sysinfo kill diff cmp more \
 	renice rmattr addattr listdev pwd chmod chown chgrp dd \
 	tee md5sum catattr query lsindex mkindex roster listimage \
-	quit open translate setvolume waitfor"
+	quit open translate setvolume waitfor uname"
 
 BEOS_SYSTEM_LIB="libbe.so libstdc++.r4.so libnet.so libmedia.so \
 	libtranslation.so libbind.so libnetapi.so libsocket.so"
 
-BEOS_SYSTEM_SERVERS="registrar syslog_daemon media_server media_addon_server"
+BEOS_SYSTEM_SERVERS="registrar syslog_daemon media_server media_addon_server input_server"
 
 BEOS_ADD_ONS_TRANSLATORS="STXTTranslator RTF-Translator"
 BEOS_ADD_ONS_MEDIA="mixer.media_addon legacy.media_addon multi_audio.media_addon"
+BEOS_ADD_ONS_INPUT_DEVICES="<input>keyboard"
 
 echo "Building executables and libraries..."
 
@@ -81,8 +82,8 @@ jam -q rc resattr kernel boot_loader config_manager pci isa ide scsi \
 	scsi_periph intel keyboard scsi_dsk scsi_cd \
 	rld.so kernel_fortune consoled \
 	$BEOS_BIN $BEOS_SYSTEM_LIB $BEOS_SYSTEM_SERVERS \
-	$BEOS_ADD_ONS_TRANSLATORS $BEOS_ADD_ONS_MEDIA \
-	kernel_uname libnet.so dprintf null zero random \<driver\>tty \
+	$BEOS_ADD_ONS_TRANSLATORS $BEOS_ADD_ONS_MEDIA $BEOS_ADD_ONS_INPUT_DEVICES\
+	libnet.so dprintf null zero random ps2_hid \<driver\>tty \
 	\<driver\>config timezone_files \
 	|| { echo "*** Build failed!" 1>&2 ; exit 1; }
 
@@ -110,12 +111,14 @@ mkdir -p beos/system/add-ons/kernel/bus_managers
 mkdir -p beos/system/add-ons/kernel/busses/ide
 mkdir -p beos/system/add-ons/kernel/drivers/bin
 mkdir -p beos/system/add-ons/kernel/drivers/dev/disk/scsi
+mkdir -p beos/system/add-ons/kernel/drivers/dev/input
 mkdir -p beos/system/add-ons/kernel/drivers/dev/misc
 mkdir -p beos/system/add-ons/kernel/file_systems
 mkdir -p beos/system/add-ons/kernel/generic
 mkdir -p beos/system/add-ons/kernel/partitioning_systems
 mkdir -p beos/system/add-ons/Translators
 mkdir -p beos/system/add-ons/media
+mkdir -p beos/system/add-ons/input_server/devices
 mkdir -p beos/system/boot
 mkdir -p beos/system/lib
 mkdir -p beos/system/servers
@@ -153,6 +156,11 @@ for f in drivers/arch/x86/keyboard/keyboard; do
 	cp $f $targetDir/beos/system/add-ons/kernel/drivers/bin
 done
 
+cd $sourceDir/distro/x86.R1/beos/system/add-ons/kernel/drivers/bin
+for f in ps2_hid; do
+	cp $f $targetDir/beos/system/add-ons/kernel/drivers/bin
+done
+
 cd $sourceDir/distro/x86.R1/beos/system/add-ons/kernel/drivers/dev
 for f in misc/config tty random dprintf null zero; do
 	cp $f $targetDir/beos/system/add-ons/kernel/drivers/bin
@@ -182,7 +190,7 @@ copyattr -d $BEOS_SYSTEM_SERVERS $targetDir/beos/system/servers/
 echo "Installing apps..."
 
 cd $sourceDir/objects/x86.R1/kernel
-for f in fortune uname; do
+for f in fortune; do
 	cp kernel_$f $targetDir/beos/bin/$f
 done
 
@@ -199,7 +207,7 @@ cp data/etc/profile $targetDir/beos/etc/
 cp src/kernel/apps/fortune/fortunes $targetDir/beos/etc/
 cp -R distro/x86.R1/beos/etc $targetDir/beos/
 cp data/settings/kernel/drivers/kernel $targetDir/home/config/settings/kernel/drivers/
-ln -sf /boot/beos/etc/timezones/Europe/Paris $targetDir//home/config/settings/timezone
+ln -sf /boot/beos/etc/timezones/Europe/Paris $targetDir/home/config/settings/timezone
 
 
 # boot loader
@@ -225,7 +233,7 @@ cd $targetDir/beos/system/add-ons/kernel
 for f in drivers/dev/dprintf drivers/dev/keyboard drivers/dev/null \
 		drivers/dev/misc/config drivers/dev/tty drivers/dev/zero \
 		drivers/dev/disk/scsi/scsi_dsk drivers/dev/disk/scsi/scsi_cd \
-		drivers/dev/misc/config; do
+		drivers/dev/misc/config drivers/dev/input/ps2_hid; do
 	relName=$(echo $f | sed -e s@drivers/dev/@@)
 	linkName=bin/$(basename $f)
 	while [ $relName != . ]; do
@@ -249,6 +257,12 @@ for f in $BEOS_ADD_ONS_MEDIA; do
 	copyattr -d $f $targetDir/beos/system/add-ons/media/
 done
 
+cd $sourceDir/distro/x86.R1/beos/system/add-ons/input_server/devices/
+for f in keyboard; do
+	copyattr -d $f $targetDir/beos/system/add-ons/input_server/devices/
+done
+
+
 # install MIME database
 mimeDBSource=$sourceDir/src/data/beos_mime
 mimeDBDest=$targetDir/home/config/settings/beos_mime
@@ -294,6 +308,7 @@ cd $previousDir
 sync
 
 if [ ! $alreadyMounted ]; then
+	echo Unmounting ...
 	sleep 1
 	unmount $targetDir
 	sleep 1