diff --git a/lirc.spec b/lirc.spec
index e0fe821..24c4c81 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4a
-Release:        1%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,6 +34,7 @@ Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
 Patch3:         lirc-0.8.4-standardized-name-fixups.patch
+Patch4:         lirc-0.8.4-cvs-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -154,6 +155,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure \
@@ -222,11 +224,6 @@ if [ $1 -eq 0 ] ; then
   /sbin/chkconfig --del lirc || :
 fi
 
-%postun
-if [ $1 -gt 0 ] ; then
-  %{_initrddir}/lirc try-restart >/dev/null || :
-fi
-
 %postun libs -p /sbin/ldconfig
 
 
@@ -265,6 +262,12 @@ fi
 
 
 %changelog
+* Mon Dec 08 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4a-2
+- Nuke bogus and harmful %%postun --try-restart (#474960)
+- Assorted updates from lirc cvs:
+  * Add uinput injection support
+  * Add support for binding lircd listener to a specific ip
+
 * Sun Oct 26 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4a-1
 - Update to lirc 0.8.4a release (fixes mode2 irrecord failures)
 - Really fix the mceusb remote config file this time