diff --git a/zsh-4.3.12-disable-c02cond-test.patch b/zsh-4.3.12-disable-c02cond-test.patch
deleted file mode 100644
index b8561c2..0000000
--- a/zsh-4.3.12-disable-c02cond-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Test/C02cond.ztst	2011-01-07 10:39:22.000000000 +0100
-+++ Test/C02cond.ztst	2011-04-21 20:21:32.000000000 +0200
-@@ -140,7 +140,7 @@
-     print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)"
-     true
-   else
--    [[ -N newnewnew && ! -N unmodified ]]
-+    true
-   fi
- 0:-N cond
- F:This test can fail on NFS-mounted filesystems as the access and
diff --git a/zsh-4.3.12-fix-c02cond-test.patch b/zsh-4.3.12-fix-c02cond-test.patch
new file mode 100644
index 0000000..5739b4a
--- /dev/null
+++ b/zsh-4.3.12-fix-c02cond-test.patch
@@ -0,0 +1,20 @@
+commit ea7e24879fe3e7bf59b4373708158d5c973282a6
+Author: Frank Terbeck <bewater@users.sourceforge.net>
+Date:   Fri Dec 30 13:37:41 2011 +0000
+
+    30048: C02cond.ztst: Avoid [[ -N ... ]] on file-systems mounted `noatime'
+
+diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
+index 629fdd2..5742755 100644
+--- a/Test/C02cond.ztst
++++ b/Test/C02cond.ztst
+@@ -139,6 +139,9 @@
+   elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then
+     print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)"
+     true
++  elif test -f /etc/mtab && { grep $(df . | tail -n1 | awk '{print $1}') /etc/mtab | grep -q noatime; }; then
++    print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with noatime file system)"
++    true
+   else
+     [[ -N newnewnew && ! -N unmodified ]]
+   fi
diff --git a/zsh.changes b/zsh.changes
index 74419e6..2a750a2 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Dec 31 10:44:15 UTC 2011 - idonmez@suse.com
+
+- Instead of disabling c02cond manually, add upstream patch to
+  automatically disable it on noatime mounted systems.
+
 -------------------------------------------------------------------
 Tue Dec 20 09:27:59 UTC 2011 - idonmez@suse.com
 
diff --git a/zsh.spec b/zsh.spec
index e4af30c..019ffb4 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -36,7 +36,7 @@ Source15:       zshenv.rhs
 Source16:       dotzshrc.rh
 Source17:       zshprompt.pl
 %endif
-Patch1:         %{name}-4.3.12-disable-c02cond-test.patch
+Patch1:         %{name}-4.3.12-fix-c02cond-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 Requires(pre):  %{install_info_prereq}
@@ -71,6 +71,8 @@ Zsh is well known for its command line completion.
 %package htmldoc
 
 Summary:        Zsh shell manual in html format
+Group:          System/Shells
+Provides:       %{name}-html = %{version}
 Obsoletes:      %{name}-html < %{version}
 
 %description htmldoc
@@ -85,7 +87,7 @@ This package contains the Zsh manual in html format.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1
+%patch1 -p1
 
 # Remove executable bit
 chmod 0644 Etc/changelog2html.pl