diff --git a/lirc.spec b/lirc.spec
index 990c902..78f781f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        5%{?pre:.%{pre}}%{?dist}
+Release:        6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,9 +34,8 @@ Patch1:         lirc-0.8.6-devinput-pass-mouse-events.patch
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch4:         lirc-0.8.6-ioctl-portability.patch
-Patch5:         lirc-0.8.6-remove-obsolete-modes.patch
-Patch6:         lirc-0.8.6-devinput-conf-update.patch
+Patch4:         lirc-0.8.6-remove-obsolete-modes.patch
+Patch5:         lirc-0.8.6-devinput-conf-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -168,7 +167,6 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -291,6 +289,9 @@ fi
 
 
 %changelog
+* Sun Apr 11 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-6
+- Revert to compat-ioctls per upstream discussion (#581326)
+
 * Wed Mar 17 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-5
 - Update devinput lircd.conf with additional keys from input.h