diff --git a/time/remind/Makefile b/time/remind/Makefile
index 5b1249c19526b..f5430bce7b900 100644
--- a/time/remind/Makefile
+++ b/time/remind/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2007/09/08 21:58:01 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/11/10 17:46:31 wiz Exp $
 #
 
-DISTNAME=	remind-03.00.24
+DISTNAME=	remind-03.01.05
 PKGNAME=	${DISTNAME:C/0([0-9])/\1/g}
 CATEGORIES=	time
-MASTER_SITES=	http://www.roaringpenguin.com/penguin/
+MASTER_SITES=	http://www.roaringpenguin.com/files/download/
 
 MAINTAINER=	kim@tac.nyc.ny.us
-HOMEPAGE=	http://www.roaringpenguin.com/penguin/openSourceProducts/remind
+HOMEPAGE=	http://www.roaringpenguin.com/products/remind
 COMMENT=	Calendar/alarm program with interpreted input language
 
 GNU_CONFIGURE=	yes
@@ -33,15 +33,11 @@ post-install:
 			${PREFIX}/share/examples/remind; \
 		${INSTALL_DATA} examples/remind.vim \
 			${PREFIX}/share/examples/remind; \
-		${INSTALL_DATA} scripts/remind-all.csh \
-			${PREFIX}/share/examples/remind; \
-		${INSTALL_DATA} scripts/remind-all.sh \
-			${PREFIX}/share/examples/remind
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/remind
 	cd ${WRKSRC}; \
 		${INSTALL_DATA} docs/README.UNIX \
 			${PREFIX}/share/doc/remind; \
-		${INSTALL_DATA} docs/WHATSNEW.30 \
+		${INSTALL_DATA} docs/WHATSNEW \
 			${PREFIX}/share/doc/remind; \
 		${INSTALL_DATA} COPYRIGHT \
 			${PREFIX}/share/doc/remind
diff --git a/time/remind/PLIST b/time/remind/PLIST
index bfa5e8e119207..8d645c8e88df3 100644
--- a/time/remind/PLIST
+++ b/time/remind/PLIST
@@ -1,23 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2006/07/22 09:25:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/11/10 17:46:31 wiz Exp $
 bin/cm2rem
-bin/kall
 bin/rem
 bin/rem2html
 bin/rem2ps
 bin/remind
 bin/tkremind
 man/man1/cm2rem.1
-man/man1/kall.1
 man/man1/rem.1
 man/man1/rem2ps.1
 man/man1/remind.1
 man/man1/tkremind.1
 share/doc/remind/COPYRIGHT
 share/doc/remind/README.UNIX
-share/doc/remind/WHATSNEW.30
+share/doc/remind/WHATSNEW
 share/examples/remind/defs.rem
-share/examples/remind/remind-all.csh
-share/examples/remind/remind-all.sh
 share/examples/remind/remind.vim
 @dirrm share/examples/remind
 @dirrm share/doc/remind
diff --git a/time/remind/distinfo b/time/remind/distinfo
index 49abc514686fa..e8ed91bb49eec 100644
--- a/time/remind/distinfo
+++ b/time/remind/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2007/09/08 21:58:01 jlam Exp $
+$NetBSD: distinfo,v 1.8 2008/11/10 17:46:31 wiz Exp $
 
-SHA1 (remind-03.00.24.tar.gz) = 7fc8823e4e574fd7630b2ff3e2f5d014003fd26b
-RMD160 (remind-03.00.24.tar.gz) = 2f84a240dd28b68e352c6f8d13ed241a2626f0d6
-Size (remind-03.00.24.tar.gz) = 303964 bytes
-SHA1 (patch-ab) = c14e78560d091c417a719a1d699b580a84f934e7
-SHA1 (patch-ac) = 6a45874750d090d91c0a2a033bdb007ae7287488
-SHA1 (patch-ad) = 56feacc6f9af5c59197900fe4591e7d54ff9372c
-SHA1 (patch-ae) = 4e90c971a519d9ac46992fe5e5ab70300c352262
+SHA1 (remind-03.01.05.tar.gz) = 6321d0bf2c29711e8871ea2818c5cb4982d0fa41
+RMD160 (remind-03.01.05.tar.gz) = 7db72c482da0e843fdf6afc5e2c49092c8322653
+Size (remind-03.01.05.tar.gz) = 312715 bytes
+SHA1 (patch-ab) = 28843c39d50a54a4e3f1086ecdf71c0141e9f24f
+SHA1 (patch-ac) = 7ddf21570f361b2d667ec331bab4059d16422dfd
+SHA1 (patch-ad) = b91a7a59a6bd4f5c6ab45bc552c42eac2ca6bfc5
+SHA1 (patch-ae) = aabd4cc46d61f50e90341867122095370c31c50b
diff --git a/time/remind/patches/patch-ab b/time/remind/patches/patch-ab
index f8a29450231c4..a5bc41e2a4e60 100644
--- a/time/remind/patches/patch-ab
+++ b/time/remind/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/10/01 08:26:56 schwarz Exp $
+$NetBSD: patch-ab,v 1.4 2008/11/10 17:46:31 wiz Exp $
 
---- src/Makefile.in.orig	2005-09-30 05:29:32.000000000 +0200
-+++ src/Makefile.in	2006-09-17 20:00:20.000000000 +0200
-@@ -15,11 +15,12 @@
+--- src/Makefile.in.orig	2008-01-26 20:36:20.000000000 +0000
++++ src/Makefile.in
+@@ -15,10 +15,11 @@ VERSION=@VERSION@
  
  INSTALL=@INSTALL@
  INSTALL_PROGRAM=@INSTALL_PROGRAM@
@@ -10,13 +10,12 @@ $NetBSD: patch-ab,v 1.3 2006/10/01 08:26:56 schwarz Exp $
  INSTALL_DATA=@INSTALL_DATA@
  
  PROGS=		remind rem2ps
- SCRIPTS=	$(srcdir)/../scripts/kall $(srcdir)/../scripts/rem \
--		$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem.tcl
-+		$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem
+-SCRIPTS=	$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem.tcl
++SCRIPTS=	$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem
  
- MANS=		$(srcdir)/../man/kall.1 $(srcdir)/../man/rem.1 \
- 		$(srcdir)/../man/rem2ps.1 $(srcdir)/../man/remind.1 \
-@@ -40,7 +41,7 @@
+ MANS=		$(srcdir)/../man/rem2ps.1 $(srcdir)/../man/remind.1 \
+ 		$(srcdir)/../man/tkremind.1 $(srcdir)/../man/cm2rem.1 \
+@@ -41,7 +42,7 @@ test: remind
  	sh ../tests/test-rem
  
  .c.o:
@@ -24,10 +23,10 @@ $NetBSD: patch-ab,v 1.3 2006/10/01 08:26:56 schwarz Exp $
 +	@CC@ -c @CFLAGS@ @CPPFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -I. -I$(srcdir) $<
  
  rem2ps: rem2ps.o dynbuf.o
- 	@CC@ @LDFLAGS@ -o rem2ps rem2ps.o dynbuf.o
-@@ -50,9 +51,12 @@
+ 	@CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o
+@@ -51,9 +52,12 @@ remind: $(REMINDOBJS)
  
- install: all
+ install-nostripped: all
  	-mkdir -p $(DESTDIR)$(bindir) || true
 -	for prog in $(PROGS) $(SCRIPTS) ; do \
 +	for prog in $(PROGS) ; do \
@@ -36,6 +35,6 @@ $NetBSD: patch-ab,v 1.3 2006/10/01 08:26:56 schwarz Exp $
 +	for prog in $(SCRIPTS) ; do \
 +		$(INSTALL_SCRIPT) $$prog $(DESTDIR)$(bindir) || exit 1; \
 +	done
- 	-strip $(DESTDIR)$(bindir)/remind || true
- 	-strip $(DESTDIR)$(bindir)/rem2ps || true
+ 	rm -f $(DESTDIR)$(bindir)/rem > /dev/null 2>&1 || true
+ 	ln -s remind $(DESTDIR)$(bindir)/rem
  	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
diff --git a/time/remind/patches/patch-ac b/time/remind/patches/patch-ac
index 3057ba84aa8e9..54f045a9fb143 100644
--- a/time/remind/patches/patch-ac
+++ b/time/remind/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2007/09/08 21:58:01 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2008/11/10 17:46:31 wiz Exp $
 
---- src/files.c.orig	2005-09-29 23:29:32.000000000 -0400
+--- src/files.c.orig	2008-03-25 03:12:37.000000000 +0000
 +++ src/files.c
-@@ -19,6 +19,7 @@ static char const RCSID[] = "$Id: files.
+@@ -18,6 +18,7 @@
  
  #include <string.h>
  #include <ctype.h>
@@ -10,8 +10,8 @@ $NetBSD: patch-ac,v 1.5 2007/09/08 21:58:01 jlam Exp $
  #include <sys/stat.h>
  
  #ifdef TM_IN_SYS_TIME
-@@ -365,16 +366,27 @@ int DoInclude(ParsePtr p)
- {     
+@@ -445,16 +446,28 @@ int DoInclude(ParsePtr p)
+ {
      DynamicBuffer buf;
      int r, e;
 +    glob_t g;
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.5 2007/09/08 21:58:01 jlam Exp $
 +    memset(&g, 0, sizeof(g));
 +
      if ( (r=ParseToken(p, &buf)) ) return r;
-     e = VerifyEoln(p); 
+     e = VerifyEoln(p);
      if (e) Eprint("%s", ErrMsg[e]);
 -    if ( (r=IncludeFile(DBufValue(&buf))) ) {
 -	DBufFree(&buf);
@@ -39,6 +39,7 @@ $NetBSD: patch-ac,v 1.5 2007/09/08 21:58:01 jlam Exp $
 +    }
 +
 +    globfree(&g);
++
      NumIfs = 0;
      IfFlags = 0;
      return OK;
diff --git a/time/remind/patches/patch-ad b/time/remind/patches/patch-ad
index 77f7301901dc6..f670b3428b579 100644
--- a/time/remind/patches/patch-ad
+++ b/time/remind/patches/patch-ad
@@ -1,11 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/17 23:32:11 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2008/11/10 17:46:31 wiz Exp $
 
---- scripts/cm2rem.tcl.orig	Thu Feb 17 22:45:38 2000
-+++ scripts/cm2rem.tcl	Sun Apr 30 23:32:07 2000
-@@ -17,5 +17,5 @@
+--- scripts/cm2rem.tcl.orig	2007-08-08 16:04:05.000000000 +0000
++++ scripts/cm2rem.tcl
+@@ -14,7 +14,7 @@
+ #--------------------------------------------------------------
  
  # the next line restarts using tclsh \
 -exec tclsh "$0" "$@"
 +exec @TCLSH@ "$0" "$@"
  
  set i 0
+ foreach month {January February March April May June
diff --git a/time/remind/patches/patch-ae b/time/remind/patches/patch-ae
index 722dc19315435..9d37ef586f8a8 100644
--- a/time/remind/patches/patch-ae
+++ b/time/remind/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/17 23:32:12 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2008/11/10 17:46:31 wiz Exp $
 
---- man/cm2rem.1.orig	Wed Mar 15 10:51:36 2000
-+++ man/cm2rem.1	Fri Mar 17 15:18:27 2000
-@@ -2,27 +2,27 @@
+--- man/cm2rem.1.orig	2007-08-08 16:04:25.000000000 +0000
++++ man/cm2rem.1
+@@ -1,27 +1,27 @@
  .TH CM2REM 1 "18 October 1999"
  .UC4
  .SH NAME