diff --git a/fix-text-password-crash.patch b/fix-text-password-crash.patch
new file mode 100644
index 0000000..6fd2884
--- /dev/null
+++ b/fix-text-password-crash.patch
@@ -0,0 +1,58 @@
+From 7a87b2210b2baa2c43276062e5a24b9b3e5760e6 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 5 Oct 2009 17:37:48 -0400
+Subject: [PATCH] [text] Don't crash after password prompt
+
+We were treating the passed in view to the
+draw handler as if it was the plugin itself.
+---
+ src/plugins/splash/text/plugin.c |   27 ++-------------------------
+ 1 files changed, 2 insertions(+), 25 deletions(-)
+
+diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
+index 6ca7ee1..bb09b22 100644
+--- a/src/plugins/splash/text/plugin.c
++++ b/src/plugins/splash/text/plugin.c
+@@ -464,37 +464,14 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
+ }
+ 
+ static void
+-clear_views (ply_boot_splash_plugin_t *plugin)
+-{
+-  ply_list_node_t *node;
+-
+-  assert (plugin != NULL);
+-  assert (plugin->loop != NULL);
+-
+-  node = ply_list_get_first_node (plugin->views);
+-  while (node != NULL)
+-    {
+-      ply_list_node_t *next_node;
+-      view_t *view;
+-
+-      view = ply_list_node_get_data (node);
+-      next_node = ply_list_get_next_node (plugin->views, node);
+-
+-      ply_text_display_clear_screen (view->display);
+-
+-      node = next_node;
+-    }
+-}
+-
+-static void
+-on_draw (ply_boot_splash_plugin_t *plugin,
++on_draw (view_t                   *view,
+          ply_terminal_t           *terminal,
+          int                       x,
+          int                       y,
+          int                       width,
+          int                       height)
+ {
+-  clear_views (plugin);
++  ply_text_display_clear_screen (view->display);
+ }
+ 
+ static void
+-- 
+1.6.5.rc2
+
diff --git a/plymouth.spec b/plymouth.spec
index 2605bfe..20a6ca0 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.2%{?dist}
+Release: 0.2009.29.09.3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -29,6 +29,9 @@ Obsoletes: plymouth-text-and-details-only < %{version}-%{release}
 Obsoletes: plymouth-plugin-pulser < 0.7.0-0.2009.05.08.2
 Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
 
+Patch0: fix-2nd-show-splash.patch
+Patch1: fix-text-password-crash.patch
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -235,6 +238,9 @@ plugin.
 %prep
 %setup -q
 
+%patch0 -p1 -b .fix-2nd-show-splash
+%patch1 -p1 -b .fix-text-password-crash
+
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
            --without-default-plugin                              \
@@ -451,6 +457,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* 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
+
 * Mon Oct  5 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.2
 - Fix --show-splash after --hide-splash (bug 527299)
 
@@ -647,8 +657,6 @@ fi
 - Update prompt text colors to be legible on new artwork
 
 * Thu Oct 30 2008 Ray Strode <rstrode@redhat.com> 0.6.0-0.2008.10.30.1
-- Drop upstreamed patches
-- Patch from Charlie to update artwork
 - Patch from Charlie to make password screen match animation better
   (bug 468899)