diff --git a/htmldoc-build-fix.patch b/htmldoc-build-fix.patch
new file mode 100644
index 000000000..424246c1b
--- /dev/null
+++ b/htmldoc-build-fix.patch
@@ -0,0 +1,16 @@
+htmldocs will fail, because device-drivers.tmpl references the
+non-existant file 8250.c (which got renamed to 8250_core.c)
+
+Signed-off-by: Kyle McMartin <kyle@redhat.com>
+
+--- a/Documentation/DocBook/device-drivers.tmpl
++++ b/Documentation/DocBook/device-drivers.tmpl
+@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
+   <chapter id="uart16x50">
+      <title>16x50 UART Driver</title>
+ !Edrivers/tty/serial/serial_core.c
+-!Edrivers/tty/serial/8250/8250.c
++!Edrivers/tty/serial/8250/8250_core.c
+   </chapter>
+ 
+   <chapter id="fbdev">
diff --git a/kernel.spec b/kernel.spec
index d18e1ab2e..a2f1f25c6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -745,6 +745,8 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
 #rhbz 927469
 Patch23006: fix-child-thread-introspection.patch
 
+Patch23007: htmldoc-build-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1440,6 +1442,8 @@ ApplyPatch mac80211-Dont-restart-sta-timer-if-not-running.patch
 #rhbz 927469
 ApplyPatch fix-child-thread-introspection.patch
 
+ApplyPatch htmldoc-build-fix.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2279,6 +2283,7 @@ fi
 * Mon Apr 01 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git0.1
 - Disable debugging options.
 - Linux v3.9-rc5
+- fix htmldoc build for 8250 rename. Patch from Kyle McMartin
 
 * Mon Apr  1 2013 Peter Robinson <pbrobinson@fedoraproject.org> 
 - Minor ARM LPAE updates