diff --git a/ChangeLog b/ChangeLog
index 30fd391..8fd60df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts, genkernel:
+  Enable keymap code when keymap is set on the kernel command line. This is
+  genkernel 3.4.10_pre10 for testing.
+
   25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.scripts:
   We need to unset keymap if it doesn't match to keep from hitting an infinite
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 6e75291..3589f40 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -430,6 +430,10 @@ cmdline_hwopts() {
 			then
 				MY_HWOPTS="`echo ${MY_HWOPTS} | sed -e \"s/${x}//g\" -`"
 			fi
+			if [ "$(echo ${y} | cut -b -7)" = "keymap=" ]
+			then
+				MY_HWOPTS="${MY_HWOPTS} dokeymap"
+			fi
 		done
 	done
    
diff --git a/genkernel b/genkernel
index 61c31a0..aa9e576 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.10_pre9'
+GK_V='3.4.10_pre10'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.