diff --git a/zsh-test-C02-dev_fd-mock.patch b/zsh-test-C02-dev_fd-mock.patch
new file mode 100644
index 0000000..7e3447e
--- /dev/null
+++ b/zsh-test-C02-dev_fd-mock.patch
@@ -0,0 +1,23 @@
+diff -ru zsh-4.3.6-orig/Test/C02cond.ztst zsh-4.3.6/Test/C02cond.ztst
+--- zsh-4.3.6-orig/Test/C02cond.ztst	2008-02-27 06:41:13.000000000 -0500
++++ zsh-4.3.6/Test/C02cond.ztst	2008-08-25 17:39:13.000000000 -0400
+@@ -180,7 +180,8 @@
+     print -u$ZTST_fd "Warning: not testing [[ -e /dev/fd/0 ]] (/dev/fd not supported)"
+     true
+   else
+-    [[ -e /dev/fd/0 ]]
++    print -u$ZTST_fd "Warning: not testing: [[ -e /dev/fd/0 ]] (mock kills us)"
++    true
+   fi
+ 0dD:/dev/fd support in conds handled by access
+ 
+@@ -188,7 +189,8 @@
+     print -u$ZTST_fd "Warning: not testing [[ -O /dev/fd/0 ]] (/dev/fd not supported)"
+     true
+   else
+-    [[ -O /dev/fd/0 ]]
++    print -u$ZTST_fd "Warning: not testing: [[ -O /dev/fd/0 ]] (mock kills us)"
++    true
+   fi
+ 0dD:/dev/fd support in conds handled by stat
+ 
diff --git a/zsh.spec b/zsh.spec
index 3723c71..a053472 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.3.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -21,6 +21,7 @@ Patch0: zsh-serial.patch
 #Patch1: zsh-4.0.6-make-test-fail.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
 Prereq: fileutils grep /sbin/install-info
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel texinfo tetex texi2html gawk /bin/hostname
@@ -55,6 +56,7 @@ 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
 #autoconf
 
 cp -p %SOURCE7 .
@@ -154,10 +156,12 @@ fi
 %doc Doc/*.html
 
 %changelog
-* Mon Aug 25 2008 James Antill <james@fedoraproject.org> - 4.3.6-2
+* Mon Aug 25 2008 James Antill <james@fedoraproject.org> - 4.3.6-3
 - Import new upstream 4.3.6
 - Rebase 8bit prompt patch.
 - Add patch fuzz=2
+- Add BuildReq on /bin/hostname directly
+- Don't test /dev/fd as mock doesn't like it
 
 * 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