diff --git a/zsh.spec b/zsh.spec
index 8b755b4..dc01fdb 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -22,6 +22,7 @@ Patch0: zsh-serial.patch
 #Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
 Patch4: zsh-4.3.6-8bit-prompts.patch
 Patch5: zsh-test-C02-dev_fd-mock.patch
+Patch6: zsh-4.3.6-hack-a01grammar-test-select-off.patch
 Prereq: fileutils grep /sbin/install-info
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel
@@ -56,8 +57,9 @@ This package contains the Zsh manual in html format.
 
 %setup -q
 %patch0 -p1 -b .serial
-%patch4 -p1 -b .8bit-prompts
-%patch5 -p1 -b .8bit-prompts
+%patch4 -p1 -b
+%patch5 -p1 -b
+%patch6 -p1 -b
 #autoconf
 
 cp -p %SOURCE7 .
@@ -161,13 +163,15 @@ fi
 %doc Doc/*.html
 
 %changelog
-* Mon Aug 25 2008 James Antill <james@fedoraproject.org> - 4.3.6-4
+* Mon Aug 25 2008 James Antill <james@fedoraproject.org> - 4.3.6-5
 - Import new upstream 4.3.6
 - Rebase 8bit prompt patch
 - Add patch fuzz=2
 - Add BuildReq on /bin/hostname directly
+- FIXME: These should all be unpatched, at some point.
 - Don't test /dev/fd as mock doesn't like it
 - Don't test the modload module, as mock doesn't like loading them all
+- Don't test the select test in A01grammar, stdin/stderr racy?
 
 * Thu Jan 31 2008 James Antill <james@fedoraproject.org> - 4.3.4-7
 - Tweak /etc/zshrc to source /etc/profile.d/*.sh in ksh compat. mode