--- xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile.orig	2006-01-18 11:06:34.000000000 +0100
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile	2006-01-18 11:07:59.000000000 +0100
@@ -9,11 +9,13 @@
 
 SRCS = hurd_init.c hurd_video.c hurd_io.c hurd_kbd.c libc_wrapper.c \
        $(BIOS_MOD).c VTsw_noop.c posix_tty.c $(MOUSESRC) \
-       stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c agp_noop.c
+       stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c agp_noop.c \
+       at_scancode.c
 
 OBJS = hurd_init.o hurd_video.o hurd_io.o hurd_kbd.o libc_wrapper.o \
        $(BIOS_MOD).o VTsw_noop.o posix_tty.o $(MOUSEOBJ) \
-       stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o agp_noop.o
+       stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o agp_noop.o \
+       at_scancode.o
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi
@@ -35,6 +37,7 @@
 LinkSourceFile(pm_noop.c,../shared)
 LinkSourceFile(kmod_noop.c,../shared)
 LinkSourceFile(agp_noop.c,../shared)
+LinkSourceFile(at_scancode.c,../shared)
 
 DependTarget()
 
--- xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_kbd.c.orig	2006-01-18 11:06:48.000000000 +0100
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_kbd.c	2006-01-18 10:49:34.000000000 +0100
@@ -161,7 +161,7 @@
     pKbd->SetKbdRepeat  = SetKbdRepeat;
     pKbd->KbdGetMapping = KbdGetMapping;
     pKbd->SpecialKey    = NULL;
-    pKbd->RemapScanCode = NULL;
+    pKbd->RemapScanCode = ATScancode;
     pKbd->GetSpecialKey = NULL;
     pKbd->OpenKeyboard  = OpenKeyboard;
     pKbd->vtSwitchSupported = FALSE;