diff --git a/firstboot-18.6-kbd.patch b/firstboot-18.6-kbd.patch
new file mode 100644
index 0000000..e60c4de
--- /dev/null
+++ b/firstboot-18.6-kbd.patch
@@ -0,0 +1,13 @@
+--- firstboot-18.6/firstboot/frontend.py	2012-11-06 01:45:36.000000000 -0800
++++ firstboot-18.6/firstboot/frontend.py.new	2013-01-04 23:25:59.983226956 -0800
+@@ -95,10 +95,6 @@
+             import gtk
+             os.write(wr, '#')
+ 
+-            kbd = keyboard.Keyboard()
+-            kbd.read()
+-            kbd.activate()
+-
+             gtk.main()
+             os._exit(0)
+ 
diff --git a/firstboot.spec b/firstboot.spec
index d33f099..aa9aace 100644
--- a/firstboot.spec
+++ b/firstboot.spec
@@ -4,11 +4,13 @@ Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
 Version: 18.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.gz
+# Don't try to read and apply keyboard config
+Patch0: firstboot-18.6-kbd.patch
 
 License: GPLv2+
 Group: System Environment/Base
@@ -40,6 +42,7 @@ a series of steps that allows for easier configuration of the machine.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -100,6 +103,9 @@ fi
 
 
 %changelog
+* Fri Jan 04 2013 Adam Williamson <awilliam@redhat.com> - 18.6-2
+- kbd.patch: don't try and read and apply keyboard config (#892097)
+
 * Tue Nov 06 2012 Martin Sivak <msivak@redhat.com> 18.6-1
 - Add support for MATE's window manager (#873342) (msivak@redhat.com)