diff --git a/ChangeLog b/ChangeLog
index fc7d705..ea94771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  Change from using a directory check to a file check. This should fix bug
+  #215822.
+
   12 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.defaults:
   Move removable storage like USB and firewire after traditional fixed storage
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 9bad20e..0e92ea9 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -507,7 +507,7 @@ setup_keymap() {
 		fi
 		[ ! -e /dev/tty0 ] && ln -s /dev/tty1 /dev/tty0
 
-		[ -d /lib/keymaps/keymapList ] && chooseKeymap
+		[ -f /lib/keymaps/keymapList ] && chooseKeymap
 
 		[ "${DEVBIND}" = '1' ] && umount /dev