diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index d20ad4eb1e9..8e0887c43a4 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.43 2009/06/29 00:38:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2009/09/07 09:10:55 sthen Exp $
 
 COMMENT=	extended C-shell with many useful features
 
-DISTNAME=	tcsh-6.15.00
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	tcsh-6.17.00
 CATEGORIES=	shells
 HOMEPAGE=	http://www.tcsh.org/
 
@@ -22,8 +21,9 @@ CONFIGURE_STYLE=gnu
 
 ALL_TARGET=	all catalogs
 
-REGRESS_DEPENDS=:autoconf-2.59*:devel/autoconf/2.59
-REGRESS_FLAGS=	AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION=2.59 
+REGRESS_DEPENDS=${MODGNU_AUTOCONF_DEPENDS}
+REGRESS_FLAGS=	AUTOCONF_VERSION=${AUTOCONF_VERSION}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 9afe209cfea..7ee1cf8d40b 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,5 +1,5 @@
-MD5 (tcsh-6.15.00.tar.gz) = Z6BhFiCwgL0OsDKxd0OCtg==
-RMD160 (tcsh-6.15.00.tar.gz) = gGUnnpO9P92yqVo/dKaAhY02UIw=
-SHA1 (tcsh-6.15.00.tar.gz) = 0k978n6AIipik7ZinBTbVH8Lc4c=
-SHA256 (tcsh-6.15.00.tar.gz) = 3Kg+WQJfGKmBGJXNfPKnYKsXUCQOp8jIbqIeJPeDrNw=
-SIZE (tcsh-6.15.00.tar.gz) = 870886
+MD5 (tcsh-6.17.00.tar.gz) = xH3pA+PVL2gkyN0Mke60dw==
+RMD160 (tcsh-6.17.00.tar.gz) = LMQaiVeZrebWJkD4d7tibxNtrDU=
+SHA1 (tcsh-6.17.00.tar.gz) = m/Z9XOG0BheOm6U17NNFU/4NTTY=
+SHA256 (tcsh-6.17.00.tar.gz) = V1JmEivCvDUchKf4WAIMDmtvlaZK1N486V40D1fkqak=
+SIZE (tcsh-6.17.00.tar.gz) = 890084
diff --git a/shells/tcsh/patches/patch-Makefile_in b/shells/tcsh/patches/patch-Makefile_in
deleted file mode 100644
index d5234d63987..00000000000
--- a/shells/tcsh/patches/patch-Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2007/05/27 18:04:47 naddy Exp $
---- Makefile.in.orig	Sat May 26 17:52:34 2007
-+++ Makefile.in	Sat May 26 17:52:53 2007
-@@ -463,7 +463,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.in
- 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
- 	} >$(srcdir)/tests/package.m4
- 
--$(srcdir)/tests/testsuite: tests/package.m4 tests/testsuite.at $(TESTFILES)
-+$(srcdir)/tests/testsuite: $(srcdir)/tests/package.m4 tests/testsuite.at $(TESTFILES)
- 	autom4te --language=autotest -I $(srcdir)/tests \
- 		$(srcdir)/tests/testsuite.at -o $@.tmp
- 	mv $@.tmp $@
diff --git a/shells/tcsh/patches/patch-config_f_h b/shells/tcsh/patches/patch-config_f_h
index edb966133d2..2c757eb7e3e 100644
--- a/shells/tcsh/patches/patch-config_f_h
+++ b/shells/tcsh/patches/patch-config_f_h
@@ -1,12 +1,12 @@
-$OpenBSD: patch-config_f_h,v 1.3 2007/05/27 18:04:47 naddy Exp $
---- config_f.h.orig	Sat May 26 15:34:04 2007
-+++ config_f.h	Sat May 26 15:36:05 2007
+$OpenBSD: patch-config_f_h,v 1.4 2009/09/07 09:10:55 sthen Exp $
+--- config_f.h.orig	Thu Jun 25 13:10:56 2009
++++ config_f.h	Thu Jul 16 15:36:27 2009
 @@ -143,7 +143,7 @@
   *		This can be much slower and no memory statistics will be
   *		provided.
   */
--#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__linux__)
-+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__linux__) || defined (__OpenBSD__)
+-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__)
++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined(__OpenBSD__)
  # define SYSMALLOC
  #else
  # undef SYSMALLOC
diff --git a/shells/tcsh/patches/patch-sh_proc_c b/shells/tcsh/patches/patch-sh_proc_c
index fcdb4beeec0..f2723ad6892 100644
--- a/shells/tcsh/patches/patch-sh_proc_c
+++ b/shells/tcsh/patches/patch-sh_proc_c
@@ -1,11 +1,7 @@
-$OpenBSD: patch-sh_proc_c,v 1.3 2009/06/29 00:38:27 sthen Exp $
-
-hunks in pkill() from http://people.freebsd.org/~mp/tcsh_kill.patch
-fix a problem with kill and backticked expressions
-
---- sh.proc.c.orig	Mon Jun 29 01:22:54 2009
-+++ sh.proc.c	Mon Jun 29 01:23:09 2009
-@@ -366,6 +366,7 @@ found:
+$OpenBSD: patch-sh_proc_c,v 1.4 2009/09/07 09:10:55 sthen Exp $
+--- sh.proc.c.orig	Thu Jun 25 22:15:37 2009
++++ sh.proc.c	Thu Jul 16 15:30:02 2009
+@@ -367,6 +367,7 @@ found:
  #ifdef notdef
  		jobflags & PAEXITED ||
  #endif /* notdef */
@@ -13,39 +9,3 @@ fix a problem with kill and backticked expressions
  		!eq(dcwd->di_name, fp->p_cwd->di_name))) {
  	    /* PWP: print a newline after ^C */
  		if (jobflags & PINTERRUPTED) {
-@@ -1428,13 +1429,6 @@ pkill(Char **v, int signum)
-     pid_t     pid;
-     Char *cp, **vp, **globbed;
- 
--    pchild_disabled++;
--    cleanup_push(&pchild_disabled, disabled_cleanup);
--    if (setintr) {
--	pintr_disabled++;
--	cleanup_push(&pintr_disabled, disabled_cleanup);
--    }
--
-     /* Avoid globbing %?x patterns */
-     for (vp = v; vp && *vp; vp++)
- 	if (**vp == '%')
-@@ -1444,6 +1438,12 @@ pkill(Char **v, int signum)
-     globbed = v;
-     cleanup_push(globbed, blk_cleanup);
- 
-+    pchild_disabled++;
-+    cleanup_push(&pchild_disabled, disabled_cleanup);
-+    if (setintr) {
-+	pintr_disabled++;
-+	cleanup_push(&pintr_disabled, disabled_cleanup);
-+    }
- 
-     while (v && (cp = *v)) {
- 	if (*cp == '%') {
-@@ -1516,7 +1516,7 @@ pkill(Char **v, int signum)
- cont:
- 	v++;
-     }
--    cleanup_until(&pchild_disabled);
-+    cleanup_until(globbed);
-     if (err1)
- 	stderror(ERR_SILENT);
- }