diff --git a/kbd-1.12-keycodes-man.patch b/kbd-1.12-keycodes-man.patch
new file mode 100644
index 0000000..22d19ca
--- /dev/null
+++ b/kbd-1.12-keycodes-man.patch
@@ -0,0 +1,49 @@
+--- kbd-1.12/man/man1/showkey.1.keycodes-man	2006-12-07 17:37:00.000000000 +0100
++++ kbd-1.12/man/man1/showkey.1	2006-12-07 18:03:08.000000000 +0100
+@@ -66,6 +66,19 @@
+ Starts
+ .B showkey
+ in `ascii' dump mode.
++
++.SH NOTES
++The raw scan codes are available only on AT and PS/2 keyboards,
++and even then they are disabled unless the
++.B atkbd.softraw=0
++kernel parameter is used.
++When the raw scan codes are not available, the kernel uses a fixed built-in
++table to produce scan codes from keycodes.  Thus,
++.BR setkeycodes (8)
++can affect the output of
++.B showkey
++in scan code dump mode.
++
+ .SH "SEE ALSO"
+ .BR loadkeys (1),
+ .BR dumpkeys (1),
+--- kbd-1.12/man/man8/setkeycodes.8.keycodes-man	2006-12-07 18:00:40.000000000 +0100
++++ kbd-1.12/man/man8/setkeycodes.8	2006-12-07 18:05:24.000000000 +0100
+@@ -40,11 +40,24 @@
+ .RE
+ will assign the keycode 112 to it, and then loadkeys(1) can be used
+ to define the function of this key.
++
++USB keyboards have standardized keycodes and
++.B setkeycodes
++doesn't affect them at all.
++
+ .SH OPTIONS
+ None.
+ .SH BUGS
+ The keycodes of X have nothing to do with those of Linux.
+ Unusual keys can be made visible under Linux, but not under X.
++
++.B setkeycodes
++affects only the "first" input device
++that has modifiable scancode-to-keycode mapping.
++If there is more than one such device,
++.B setkeycodes
++cannot change the mapping of other devices than the "first" one.
++
+ .SH "SEE ALSO"
+ .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
+ 
diff --git a/kbd.spec b/kbd.spec
index fce3eae..5164472 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 19%{?dist}
+Release: 20
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -24,6 +24,7 @@ Patch8: kbd-1.12-dir.patch
 Patch9: kbd-1.12-no-user-map.patch
 Patch10: kbd-1.12-resizecon-man.patch
 Patch11: kbd-1.12-gr-el.patch
+Patch12: kbd-1.12-keycodes-man.patch
 Obsoletes: console-tools open
 Provides: console-tools open
 Conflicts: util-linux < 2.11r-9
@@ -50,6 +51,7 @@ fonts, the virtual terminals and font files.
 %patch9 -p1 -b .no-user-map
 %patch10 -p1 -b .resizecon-man
 %patch11 -p1 -b .gr-el
+%patch12 -p1 -b .keycodes-man
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -129,6 +131,11 @@ ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Thu Dec  7 2006 Miloslav Trmac <mitr@redhat.com> - 1.12-20
+- Document that setkeycodes doesn't affect USB keyboards and that the kernel
+  doesn't provide the raw scan codes by default
+  Resolves: #211803
+
 * Tue Oct 31 2006 Miloslav Trmac <mitr@redhat.com> - 1.12-19
 - Ship "el" translation instead of the obsolete "gr" translation
   Resolves: #210749