diff --git a/plymouth-0.6.0-fix-switchroot-failed.patch b/plymouth-0.6.0-fix-switchroot-failed.patch
deleted file mode 100644
index 1de8707..0000000
--- a/plymouth-0.6.0-fix-switchroot-failed.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up plymouth-0.6.0/src/main.c.fix-switchroot-failed plymouth-0.6.0/src/main.c
---- plymouth-0.6.0/src/main.c.fix-switchroot-failed	2008-11-06 10:43:41.000000000 -0500
-+++ plymouth-0.6.0/src/main.c	2008-11-06 18:12:51.000000000 -0500
-@@ -77,6 +77,7 @@ static ply_window_t *create_window (stat
-                                     const char *tty_name);
- 
- static bool attach_to_running_session (state_t *state);
-+static void on_escape_pressed (state_t *state);
- 
- static void
- on_session_output (state_t    *state,
-@@ -171,8 +172,11 @@ on_newroot (state_t    *state,
-   chdir(root_dir);
-   chroot(".");
-   chdir("/");
--  ply_progress_load_cache (state->progress);
--  ply_boot_splash_root_mounted (state->boot_splash);
-+  if (state->boot_splash != NULL)
-+    {
-+      ply_progress_load_cache (state->progress);
-+      ply_boot_splash_root_mounted (state->boot_splash);
-+    }
- }
- 
- static void
-@@ -356,6 +360,8 @@ on_hide_splash (state_t *state)
- {
- 
-   ply_trace ("hiding boot splash");
-+  state->showing_details = false;
-+  on_escape_pressed (state);
-   if (state->boot_splash != NULL)
-     ply_boot_splash_hide (state->boot_splash);
- 
-@@ -384,11 +390,12 @@ on_quit (state_t *state,
-   if (state->boot_splash != NULL)
-     {
-       if (!retain_splash)
--        on_hide_splash (state);
--      else
--        quit_splash (state);
--      ply_boot_splash_free (state->boot_splash);
--      state->boot_splash = NULL;
-+        {
-+          if (state->boot_splash != NULL)
-+              ply_boot_splash_hide (state->boot_splash);
-+        }
-+
-+      quit_splash (state);
-     }
-   ply_trace ("exiting event loop");
-   ply_event_loop_exit (state->loop, 0);
-diff -up plymouth-0.6.0/src/plugins/splash/details/plugin.c.fix-switchroot-failed plymouth-0.6.0/src/plugins/splash/details/plugin.c
---- plymouth-0.6.0/src/plugins/splash/details/plugin.c.fix-switchroot-failed	2008-11-06 18:25:43.000000000 -0500
-+++ plymouth-0.6.0/src/plugins/splash/details/plugin.c	2008-11-06 18:25:47.000000000 -0500
-@@ -231,8 +231,6 @@ static void
- uninitialize_window (ply_window_t             *window,
-                      ply_boot_splash_plugin_t *plugin)
- {
--  ply_window_clear_screen (window);
--
-   ply_window_set_keyboard_input_handler (window, NULL, NULL);
-   ply_window_set_backspace_handler (window, NULL, NULL);
-   ply_window_set_enter_handler (window, NULL, NULL);
diff --git a/plymouth-allow-passing-plugin.patch b/plymouth-allow-passing-plugin.patch
deleted file mode 100644
index 741e081..0000000
--- a/plymouth-allow-passing-plugin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
-index e9db1b9..cc640e5 100755
---- a/scripts/plymouth-populate-initrd.in
-+++ b/scripts/plymouth-populate-initrd.in
-@@ -10,6 +10,7 @@
- [ -z "$BINDIR" ] && BINDIR="/usr/bin"
- [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
- [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
-+[ -z "$PLYMOUTH_PLUGIN_NAME" ] && PLYMOUTH_PLUGIN_NAME=$(plymouth-set-default-plugin)
- 
- if [ -f "${LIBEXECDIR}/initrd-functions" ]; then
-     . "${LIBEXECDIR}/initrd-functions"
-@@ -63,22 +64,20 @@ inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
- inst /etc/system-release $INITRDDIR
- mkdir -p ${INITRDDIR}${DATADIR}/plymouth
- 
--PLUGIN_NAME=$(plymouth-set-default-plugin)
--
--if [ -z "$PLUGIN_NAME" ]; then
-+if [ -z "$PLYMOUTH_PLUGIN_NAME" ]; then
-     echo "No default plymouth plugin is set" > /dev/stderr
-     exit 1
- fi
- 
--if [ ! -f ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ]; then
--    echo "The default plymouth plugin (${PLUGIN_NAME}) doesn't exist" > /dev/stderr
-+if [ ! -f ${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME}.so ]; then
-+    echo "The default plymouth plugin (${PLYMOUTH_PLUGIN_NAME}) doesn't exist" > /dev/stderr
-     exit 1
- fi
- 
--inst ${LIBDIR}/plymouth/${PLUGIN_NAME}.so $INITRDDIR
-+inst ${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME}.so $INITRDDIR
- inst ${LIBDIR}/plymouth/default.so $INITRDDIR
--if [ -d ${DATADIR}/plymouth/${PLUGIN_NAME} ]; then
--    for x in ${DATADIR}/plymouth/${PLUGIN_NAME}/* ; do
-+if [ -d ${DATADIR}/plymouth/${PLYMOUTH_PLUGIN_NAME} ]; then
-+    for x in ${DATADIR}/plymouth/${PLYMOUTH_PLUGIN_NAME}/* ; do
-         [ ! -f "$x" ] && break
-         inst $x $INITRDDIR
-     done
diff --git a/plymouth.spec b/plymouth.spec
index 78aba1b..e9fd167 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -5,13 +5,11 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 0.2008.11.06.2%{?dist}
+Release: 0.2008.11.10.1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
 Source1: boot-duration
-Patch0: plymouth-allow-passing-plugin.patch
-Patch1: plymouth-0.6.0-fix-switchroot-failed.patch
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -154,8 +152,6 @@ where the graphical plugin's dependencies are undesirable.
 
 %prep
 %setup -q
-%patch0 -p1 -b .allow-passing-plugin
-%patch1 -p1 -b .fix-switchroot-failed
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -308,6 +304,11 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Nov 10 2008 Ray Strode <rstrode@redhat.com> 0.6.0-0.2008.11.10.1
+- Fix feedback loop with plymouth:debug
+- Move patches upstream
+- Improve comet animation
+
 * Thu Nov  6 2008 Ray Strode <rstrode@redhat.com> 0.6.0-0.2008.11.06.2
 - show details plugin on --hide-splash so people can see why the splash
   got hidden.