diff --git a/lirc-streamzap-prev-next.patch b/lirc-streamzap-prev-next.patch
new file mode 100644
index 0000000..daef5f4
--- /dev/null
+++ b/lirc-streamzap-prev-next.patch
@@ -0,0 +1,13 @@
+--- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2008-10-01 12:09:37.000000000 +0100
++++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-10-06 09:08:57.000000000 +0100
+@@ -53,8 +53,8 @@ begin remote
+           KEY_PLAY                     0x17
+           KEY_PAUSE                    0x18
+           KEY_STOP                     0x19
+-          |<<                      0x1A
+-          >>|                      0x1B
++          KEY_PREVIOUS                      0x1A
++          KEY_NEXT                      0x1B
+           KEY_RECORD                   0x1C
+           KEY_REWIND                       0x1D
+           KEY_FORWARD                       0x1E
diff --git a/lirc.spec b/lirc.spec
index f4d436a..03bb9f8 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4
-Release:        0.2%{?pre:.%{pre}}%{?dist}
+Release:        0.3%{?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
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
+Patch2:		lirc-streamzap-prev-next.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -153,6 +154,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 # Do this after, as we're touching the remote definitions earlier
 # Don't create a backup, or the original definitions will get installed
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \
@@ -264,6 +266,9 @@ fi
 
 
 %changelog
+* Mon Oct 06 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.3.pre1
+- Fix more keycodes for the streamzap remote
+
 * Wed Oct 01 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.2.pre1
 - Don't create a backup for the keycodes patch, or all the original files
   will also get installed, and get used in gnome-lirc-properties