diff --git a/zsh-4.3.12-test-3.tar.bz2 b/zsh-4.3.12-test-3.tar.bz2
new file mode 100644
index 0000000..d22e2ad
--- /dev/null
+++ b/zsh-4.3.12-test-3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47bd04cb35933d2a9d70fb8301f7dc08e55da4a80f4f79c7d70a9423d617aa11
+size 2965438
diff --git a/zsh-4.3.12.tar.bz2 b/zsh-4.3.12.tar.bz2
deleted file mode 100644
index 758b1d7..0000000
--- a/zsh-4.3.12.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106
-size 2917959
diff --git a/zsh-findproc.patch b/zsh-findproc.patch
deleted file mode 100644
index 73c4533..0000000
--- a/zsh-findproc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 21c39600ef2d74c3e7474c4e5b89805656c6fe4e
-Author: Bart Schaefer <barts@users.sourceforge.net>
-Date:   Sun Jun 12 15:06:37 2011 +0000
-
-    29472: findproc() needs at least to also return	stopped jobs.
-
-diff --git a/Src/jobs.c b/Src/jobs.c
-index b3ec000..0ace80b 100644
---- a/Src/jobs.c
-+++ b/Src/jobs.c
-@@ -189,7 +189,8 @@ findproc(pid_t pid, Job *jptr, Process *pptr, int aux)
- 	     * the termination of the process which pid we were supposed
- 	     * to return in a different job.
- 	     */
--	    if (pn->pid == pid && pn->status == SP_RUNNING) {
-+	    if (pn->pid == pid && (pn->status == SP_RUNNING ||
-+				   WIFSTOPPED(pn->status))) {
- 		*pptr = pn;
- 		*jptr = jobtab + i;
- 		return 1;
diff --git a/zsh-kill-suspended-job.patch b/zsh-kill-suspended-job.patch
deleted file mode 100644
index 12d719b..0000000
--- a/zsh-kill-suspended-job.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 98b29d02ca17068779f4b8fa2d43c9753386478f
-Author: Bart Schaefer <barts@users.sourceforge.net>
-Date:   Wed Jun 15 15:38:14 2011 +0000
-
-    29481: always return a matching job in findproc() but scan the whole list
-    to prefer running jobs
-
-diff --git a/Src/jobs.c b/Src/jobs.c
-index 0ace80b..9c9b12f 100644
---- a/Src/jobs.c
-+++ b/Src/jobs.c
-@@ -160,6 +160,8 @@ findproc(pid_t pid, Job *jptr, Process *pptr, int aux)
-     Process pn;
-     int i;
- 
-+    *jptr = NULL;
-+    *pptr = NULL;
-     for (i = 1; i <= maxjob; i++)
-     {
- 	/*
-@@ -189,16 +191,16 @@ findproc(pid_t pid, Job *jptr, Process *pptr, int aux)
- 	     * the termination of the process which pid we were supposed
- 	     * to return in a different job.
- 	     */
--	    if (pn->pid == pid && (pn->status == SP_RUNNING ||
--				   WIFSTOPPED(pn->status))) {
-+	    if (pn->pid == pid) {
- 		*pptr = pn;
- 		*jptr = jobtab + i;
--		return 1;
-+		if (pn->status == SP_RUNNING) 
-+		    return 1;
- 	    }
- 	}
-     }
- 
--    return 0;
-+    return (*pptr && *jptr);
- }
- 
- /* Does the given job number have any processes? */
-diff --git a/Src/signals.c b/Src/signals.c
-index 456a853..a848acd 100644
---- a/Src/signals.c
-+++ b/Src/signals.c
-@@ -489,7 +489,6 @@ wait_for_processes(void)
- 	 * Find the process and job containing this pid and
- 	 * update it.
- 	 */
--	pn = NULL;
- 	if (findproc(pid, &jn, &pn, 0)) {
- #if defined(HAVE_WAIT3) && defined(HAVE_GETRUSAGE)
- 	    struct timezone dummy_tz;
diff --git a/zsh.changes b/zsh.changes
index 5fc0c73..1a2a245 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov 28 08:36:51 UTC 2011 - idoenmez@suse.de
+
+- Update to 4.2.12-test3
+  * See included ChangeLog for details
+- Drop zsh-findproc.patch and zsh-kill-suspended-job.patch, fixed
+  upstream.
+
 -------------------------------------------------------------------
 Thu Nov 24 09:00:37 UTC 2011 - idoenmez@suse.de
 
diff --git a/zsh.spec b/zsh.spec
index e7079ab..d1259ce 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -18,7 +18,7 @@
 
 
 Name:           zsh
-Version:        4.3.12
+Version:        4.3.12+test3
 Release:        4
 License:        BSD
 Summary:        Shell with comprehensive completion
@@ -28,8 +28,7 @@ Group:          System/Shells
 %else
 Group:          System Environment/Shells
 %endif
-#Source0:        ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/zsh-4.3.12.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.zsh.org/pub/development/zsh-4.3.12-test-3.tar.bz2
 Source1:        zshrc
 Source2:        zshenv
 Source3:        zprofile
@@ -42,13 +41,9 @@ Source15:       zshenv.rhs
 Source16:       dotzshrc.rh
 Source17:       zshprompt.pl
 %endif
-Patch1:         %{name}-%{version}-disable-c02cond-test.patch
-# PATCH-FIX-UPSTREAM zsh-findproc.patch idoenmez@suse.de -- Upstream commit 21c39600ef2d74c3e7474c4e5b89805656c6fe4e
-Patch2:         %{name}-findproc.patch
-# PATCH-FIX-UPSTREAM zsh-kill-suspended-job.patch idoenmez@suse.de -- Upstream commit 98b29d02ca17068779f4b8fa2d43c9753386478f 
-Patch3:         %{name}-kill-suspended-job.patch
+Patch1:         %{name}-4.3.12-disable-c02cond-test.patch
 # PATCH-FIX ksh-emulation-syntax-checking.patch -- Import and rework from RHEL (zsh-4.2.6)
-Patch4:         %{name}-4.3.12-ksh-emulation-syntax-checking.patch
+Patch2:         %{name}-4.3.12-ksh-emulation-syntax-checking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 PreReq:         %{install_info_prereq}
@@ -99,11 +94,9 @@ mechanism, and more.
 This package contains the Zsh manual in html format.
 
 %prep
-%setup -q
+%setup -q -n %{name}-4.3.12-test-3
 %patch1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 ##rpmlint
 # spurious-executable-perm
@@ -257,9 +250,6 @@ fi
   fi
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %doc ChangeLog FEATURES LICENCE MACHINES META-FAQ NEWS README