diff --git a/tcsh-6.15.00-longjmp.dif b/tcsh-6.15.00-longjmp.dif
index b7faf03..28cb6f9 100644
--- a/tcsh-6.15.00-longjmp.dif
+++ b/tcsh-6.15.00-longjmp.dif
@@ -48,8 +48,8 @@
 +	else
 +	    haderr = 1;
      }
-     exitset--;
      cleanup_pop_mark(omark);
+     resexit(osetexit);
 --- sh.decls.h
 +++ sh.decls.h	2007-07-23 15:37:27.493023737 +0200
 @@ -90,6 +90,7 @@ extern	void		  cleanup_push_internal(voi
diff --git a/tcsh-6.16.00.dif b/tcsh-6.16.00.dif
index f0bed13..c75708c 100644
--- a/tcsh-6.16.00.dif
+++ b/tcsh-6.16.00.dif
@@ -249,7 +249,7 @@
 +#include <features.h>
  #include "sh.h"
  
- RCSID("$tcsh: sh.dol.c,v 3.70 2006/09/14 18:30:16 christos Exp $")
+ RCSID("$tcsh: sh.dol.c,v 3.74 2008/05/14 20:10:30 christos Exp $")
 @@ -922,6 +923,31 @@ heredoc(Char *term)
      Char *lbp, *obp, *mbp;
      Char  **vp;
@@ -356,17 +356,6 @@
  #   include <features.h>
  #  endif
  #  ifdef SUNOS4
---- sh.lex.c
-+++ sh.lex.c	2006-04-25 14:58:31.000000000 +0200
-@@ -1447,7 +1447,7 @@ reread:
- 		pid_t ctpgrp;
- #endif /* BSDJOBS */
- 
--		if (numeof != 0 && ++sincereal >= numeof)	/* Too many EOFs?  Bye! */
-+		if (++sincereal >= numeof)	/* Too many EOFs?  Bye! */
- 		    goto oops;
- #ifdef BSDJOBS
- 		if (tpgrp != -1 &&
 --- sh.sem.c
 +++ sh.sem.c	2006-04-25 14:58:31.000000000 +0200
 @@ -622,10 +622,19 @@ execute(struct command *t, volatile int 
diff --git a/tcsh.changes b/tcsh.changes
index 8a85859..63270a4 100644
--- a/tcsh.changes
+++ b/tcsh.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec  7 11:23:30 CET 2009 - meissner@suse.de
+
+- fixed patch fuzz in a minimalistic way.
+
+-------------------------------------------------------------------
+Wed Dec  2 17:24:05 CET 2009 - werner@suse.de
+
+- Remove left over in old patch to re-enable message on suppended
+  jobs at exit/logout
+  
 -------------------------------------------------------------------
 Fri Aug 14 10:29:22 CEST 2009 - werner@suse.de
 
diff --git a/tcsh.spec b/tcsh.spec
index 2e50fce..25aafe9 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -21,12 +21,12 @@
 Name:           tcsh
 BuildRequires:  ncurses-devel
 Url:            http://www.tcsh.org/
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Group:          System/Shells
 Requires:       gawk textutils
 AutoReqProv:    on
 Version:        6.16.00
-Release:        4
+Release:        5
 Summary:        The C SHell
 Source:         ftp.astron.com:/pub/tcsh/tcsh-6.16.00.tar.bz2
 Source1:        nls-iconv