diff --git a/misc/remind/Makefile b/misc/remind/Makefile
index 05b5117640f..823ab84b0e5 100644
--- a/misc/remind/Makefile
+++ b/misc/remind/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2010/11/19 07:23:12 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2012/07/04 18:38:36 stu Exp $
 
 COMMENT=	scripting language for reminders, with a Tk front end
 
-DISTNAME=	remind-03.01.03
-PKGNAME=	remind-3.1.3
-REVISION=	0
+DISTNAME=	remind-03.01.12
+PKGNAME=	remind-3.1.12
 CATEGORIES=	misc
 
 MASTER_SITES=	http://www.roaringpenguin.com/files/download/
@@ -20,18 +19,20 @@ PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB=		c m
 
-# Can run without TK, but most unglamorous without it.
-RUN_DEPENDS=	x11/tk/8.4 \
+MODULES=		x11/tk
+RUN_DEPENDS=	${MODTK_RUN_DEPENDS} \
 		devel/tcllib
 
-USE_GROFF =	Yes
 CONFIGURE_STYLE=	gnu
 
+REGRESS_TARGET=		test
+
+pre-configure:
+	${MODTCL_WISH_ADJ}  ${WRKSRC}/scripts/tkremind
+	${MODTCL_TCLSH_ADJ} ${WRKSRC}/scripts/cm2rem.tcl
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/remind
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/remind
 
-do-regress:
-	cd ${WRKSRC}/tests; sh test-rem
-
 .include <bsd.port.mk>
diff --git a/misc/remind/distinfo b/misc/remind/distinfo
index b32a65ffeec..7ceb4a73280 100644
--- a/misc/remind/distinfo
+++ b/misc/remind/distinfo
@@ -1,5 +1,5 @@
-MD5 (remind-03.01.03.tar.gz) = MvpTkJEIKdsW8fEmoBIOlA==
-RMD160 (remind-03.01.03.tar.gz) = tW1VVtTtUjwJsZPC+8fhUJGKLg4=
-SHA1 (remind-03.01.03.tar.gz) = hkmQkAGZIQLhsedAa5y2EfSn77E=
-SHA256 (remind-03.01.03.tar.gz) = 5w2a5Xyc/cQbDrONoGzfSMt/OMEabXfgaKhqXGeyLYs=
-SIZE (remind-03.01.03.tar.gz) = 304315
+MD5 (remind-03.01.12.tar.gz) = 3hbL/D7pTe/LGr33iy680Q==
+RMD160 (remind-03.01.12.tar.gz) = 2Y+xCunWy/Unfe0T3r4czQW8n7E=
+SHA1 (remind-03.01.12.tar.gz) = CXg1cBSRbgxSWeGLhF0pHus2e2w=
+SHA256 (remind-03.01.12.tar.gz) = uMd3PruugMfzQAc8DH9zEkZyxWqVDXIfav2reyn5y7k=
+SIZE (remind-03.01.12.tar.gz) = 361662
diff --git a/misc/remind/patches/patch-scripts-cm2rem b/misc/remind/patches/patch-scripts-cm2rem
deleted file mode 100644
index 51f78e8f015..00000000000
--- a/misc/remind/patches/patch-scripts-cm2rem
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/cm2rem.tcl.orig	Wed Aug  8 12:04:05 2007
-+++ scripts/cm2rem.tcl	Wed Dec 12 16:33:41 2007
-@@ -14,7 +14,7 @@
- #--------------------------------------------------------------
- 
- # the next line restarts using tclsh \
--exec tclsh "$0" "$@"
-+exec tclsh8.4 "$0" "$@"
- 
- set i 0
- foreach month {January February March April May June
diff --git a/misc/remind/patches/patch-scripts-tkremind b/misc/remind/patches/patch-scripts-tkremind
deleted file mode 100644
index 6dd8bff87fe..00000000000
--- a/misc/remind/patches/patch-scripts-tkremind
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/tkremind.orig	Mon Sep 10 16:53:22 2007
-+++ scripts/tkremind	Wed Dec 12 16:33:41 2007
-@@ -13,7 +13,7 @@
- #--------------------------------------------------------------
- 
- # the next line restarts using wish \
--exec wish "$0" "$@"
-+exec wish8.4 "$0" "$@"
- 
- wm withdraw .
- 
diff --git a/misc/remind/patches/patch-tests_test-rem b/misc/remind/patches/patch-tests_test-rem
new file mode 100644
index 00000000000..55ebdfb79fe
--- /dev/null
+++ b/misc/remind/patches/patch-tests_test-rem
@@ -0,0 +1,15 @@
+$OpenBSD: patch-tests_test-rem,v 1.1 2012/07/04 18:38:36 stu Exp $
+
+Fix broken test. From upstream.
+
+--- tests/test-rem.orig	Tue May  8 17:14:59 2012
++++ tests/test-rem	Tue May  8 17:17:42 2012
+@@ -68,7 +68,7 @@ echo "Sort Test" >> ../tests/test.out
+ (echo "REM AT 12:00 MSG Untimed"; echo "REM MSG Timed") | ../src/remind -q -gaaad - 1 Jan 2000 >> ../tests/test.out 2>&1
+ 
+ echo "Purge Test" >> ../tests/test.out
+-../src/remind -j999 ../tests/purge_dir/f1.rem >> ../tests/test.out 2>&1
++../src/remind -j999 ../tests/purge_dir/f1.rem 3 Feb 2012 >> ../tests/test.out 2>&1
+ echo "F1" >> ../tests/test.out
+ cat ../tests/purge_dir/f1.rem.purged >> ../tests/test.out
+ echo "F2" >> ../tests/test.out
diff --git a/misc/remind/pkg/PLIST b/misc/remind/pkg/PLIST
index 55cd14e91ca..1ce50006447 100644
--- a/misc/remind/pkg/PLIST
+++ b/misc/remind/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.5 2007/12/12 21:39:40 okan Exp $
+@comment $OpenBSD: PLIST,v 1.6 2012/07/04 18:38:36 stu Exp $
 bin/cm2rem.tcl
 bin/rem
-bin/rem2ps
-bin/remind
+@bin bin/rem2ps
+@bin bin/remind
 bin/tkremind
 @man man/man1/cm2rem.1
 @man man/man1/rem.1