diff --git a/fix-firstboot-on-intel.patch b/fix-firstboot-on-intel.patch
new file mode 100644
index 0000000..2a17d87
--- /dev/null
+++ b/fix-firstboot-on-intel.patch
@@ -0,0 +1,26 @@
+From 3228d0534dc35e9afb87702a78555598fda61a87 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 6 Oct 2009 19:07:41 -0400
+Subject: [drm] Destroy console buffer object when done with it
+
+---
+ src/plugins/renderers/drm/plugin.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
+index d317e2a..22a4394 100644
+--- a/src/plugins/renderers/drm/plugin.c
++++ b/src/plugins/renderers/drm/plugin.c
+@@ -855,6 +855,9 @@ ply_renderer_head_set_scan_out_buffer_to_console (ply_renderer_backend_t *backen
+   ply_renderer_head_set_scan_out_buffer (backend,
+                                          head, head->console_buffer_id);
+ 
++  backend->driver_interface->destroy_buffer (backend->driver,
++                                             head->console_buffer_id);
++
+   if (pixel_buffer != NULL)
+     ply_pixel_buffer_free (pixel_buffer);
+ 
+-- 
+1.6.5.rc2
+
diff --git a/plymouth.spec b/plymouth.spec
index 20a6ca0..97b8430 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.3%{?dist}
+Release: 0.2009.29.09.4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
 
 Patch0: fix-2nd-show-splash.patch
 Patch1: fix-text-password-crash.patch
+Patch2: fix-firstboot-on-intel.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -240,6 +241,7 @@ plugin.
 
 %patch0 -p1 -b .fix-2nd-show-splash
 %patch1 -p1 -b .fix-text-password-crash
+%patch2 -p1 -b .fix-firstboot-on-intel
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -457,6 +459,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Oct 06 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.4
+- Prevent firstboot's X from crashing on intel hardware
+
 * Mon Oct 05 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.3
 - Fix crasher in text plugin after password prompt (bug 526652)
 - Actually apply the patch mentioned in 2009.29.09.2