diff --git a/.cvsignore b/.cvsignore
index 33af252..b1f1279 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-plymouth-0.3.2.tar.bz2
+plymouth-0.4.0.tar.bz2
diff --git a/fix-harmless-spew.patch b/fix-harmless-spew.patch
new file mode 100644
index 0000000..23a8dc2
--- /dev/null
+++ b/fix-harmless-spew.patch
@@ -0,0 +1,25 @@
+commit cc0fc4e577e4f397e7115eabfa74ce2f2629f29c
+Author: Ray Strode <rstrode@redhat.com>
+Date:   Sun Jun 22 01:19:18 2008 -0400
+
+    /Really/ exit cleanly if rhgb isn't present on kernel cmdline
+    
+    Unlike b7f4399294fad3d70029526cd7334c50d8673214 which was
+    broken
+
+diff --git a/src/main.c b/src/main.c
+index f554ce0..e855f68 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -454,7 +454,10 @@ main (int    argc,
+   if (!initialize_environment (&state))
+     {
+       if (errno == 0)
+-        return 0;
++        {
++          ply_detach_daemon (daemon_handle, 0);
++          return 0;
++        }
+ 
+       ply_error ("could not setup basic operating environment: %m");
+       ply_detach_daemon (daemon_handle, EX_OSERR);
diff --git a/plymouth.spec b/plymouth.spec
index 582e197..1f5488a 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
-Version: 0.3.2
-Release: 2%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -12,7 +12,7 @@ Obsoletes: rhgb < 1:10.0.0
 Provides: rhgb = 1:10.0.0
 
 Requires: system-logos >= 9.0.1
-Patch0: drop-text-mode.patch
+Patch0: fix-harmless-spew.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -63,7 +63,7 @@ spins in the shape of an infinity sign.
 
 %prep
 %setup -q
-%patch0 -p1 -b .drop-text-mode
+%patch0 -p1 -b .fix-harmless-spew
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -107,9 +107,9 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post plugin-fade-in
-if [ $1 -eq 1 ]; then
-    %{_sbindir}/plymouth-set-default-plugin fade-in
-fi
+#if [ $1 -eq 1 ]; then
+#    %{_sbindir}/plymouth-set-default-plugin fade-in
+#fi
 
 %postun plugin-fade-in
 if [ $1 -eq 0 ]; then
@@ -164,6 +164,11 @@ fi
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Sun Jun 22 2008 Ray Strode <rstrode@redhat.com> - 0.4.0-1
+- Update to version 0.4.0
+- Only run if rhgb is on kernel command line
+- Make text plugin more animated
+
 * Mon Jun 16 2008 Ray Strode <rstrode@redhat.com> - 0.3.2-2
 - dont go back to text mode on exit
 
diff --git a/sources b/sources
index c254c45..a326ea8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0341056421fde133e12f90cf9b3ed791  plymouth-0.3.2.tar.bz2
+e60b35f5458aa2ecd37ccbf7b0e5b044  plymouth-0.4.0.tar.bz2