diff --git a/x11/rclock/Makefile b/x11/rclock/Makefile
index 6b02e817682..e82c8ab26c9 100644
--- a/x11/rclock/Makefile
+++ b/x11/rclock/Makefile
@@ -1,28 +1,18 @@
-# OpenBSD makefile for: 	  rclock
-# Version required:		  2.19
-# Date created:			  May 19 1998
-# Whom:				  Angelos D. Keromytis
-#
-# $OpenBSD: Makefile,v 1.2 1999/10/31 07:49:01 turan Exp $
-#
+# $OpenBSD: Makefile,v 1.3 1999/10/31 18:50:52 brad Exp $
 
-BROKEN=		checksum mismatch
-
-PKGNAME=	rclock-2.20
-DISTNAME=	rxvt-2.20
+PKGNAME=	rclock-2.6.1
+DISTNAME=	rxvt-2.6.1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
-		ftp://ftp.nuclecu.unam.mx/linux/local/rxvt/  \
-		ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/
-MASTER_SITE_SUBDIR=	utils/file/managers/mc/rxvt
-#MASTER_SITE_SUBDIR=	X11/xutils/terms
+MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
+		ftp://mason.primenet.com.au/pub/rxvt/ \
+		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR= X11/terms
 
 MAINTAINER=	angelos@openbsd.org
 
-CFLAGS+=	'-DMAIL_SPOOL=\"/var/mail/\"'
 USE_X11=	yes
 GNU_CONFIGURE=  yes
+
 ALL_TARGET=	clock
-MAN1=		rclock.1
 
 .include <bsd.port.mk>
diff --git a/x11/rclock/files/md5 b/x11/rclock/files/md5
index 28eb55d51e9..8bf0f097afa 100644
--- a/x11/rclock/files/md5
+++ b/x11/rclock/files/md5
@@ -1,3 +1,3 @@
-MD5 (rxvt-2.20.tar.gz) = 860432f0d146d0cdf4630967f6c94ae3
-RMD160 (rxvt-2.20.tar.gz) = a791f6c4aec0cc857112bd8266f348a66d34be64
-SHA1 (rxvt-2.20.tar.gz) = 54768f966a7b4a52b6f3cca1513d421840958deb
+MD5 (rxvt-2.6.1.tar.gz) = 4e288c1bd50cb6d18565366c2cd7ae29
+RMD160 (rxvt-2.6.1.tar.gz) = 2234dc98819742a2db9dbace96f64749f824b3f6
+SHA1 (rxvt-2.6.1.tar.gz) = b7dd114a5ba94e6e6d9ea05c799875e09d81476a
diff --git a/x11/rclock/patches/patch-aa b/x11/rclock/patches/patch-aa
index 861a5c1eb6a..ca642600c85 100644
--- a/x11/rclock/patches/patch-aa
+++ b/x11/rclock/patches/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Sep 27 10:48:20 1996
-+++ Makefile.in	Mon Feb 24 01:09:28 1997
-@@ -7,7 +7,7 @@
+--- Makefile.in.orig	Mon Mar 29 00:31:37 1999
++++ Makefile.in	Sun Oct 31 12:28:43 1999
+@@ -9,7 +9,7 @@
  first_rule: all
  dummy:
  
 -subdirs = src doc rclock src/graphics
 +subdirs = rclock # src doc rclock src/graphics
  
- DIST_ETC = etc/XTerm.ad etc/color etc/termcap etc/terminfo etc/xmkdir
+ DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
diff --git a/x11/rclock/patches/patch-ab b/x11/rclock/patches/patch-ab
new file mode 100644
index 00000000000..16ea0bea682
--- /dev/null
+++ b/x11/rclock/patches/patch-ab
@@ -0,0 +1,11 @@
+--- rclock/feature.h.orig	Sun Oct 31 12:37:05 1999
++++ rclock/feature.h	Sun Oct 31 12:37:31 1999
+@@ -53,7 +53,7 @@
+ #define MAIL
+ /* #define MAIL_BELL */
+ /* #define MAIL_SPAWN	"xmh\ -font\ 7x14\&" */
+-/* #define MAIL_SPOOL	"/var/spool/mail/" */
++#define MAIL_SPOOL	"/var/mail/"
+ 
+ /*----------------------------------------------------------------------*
+  * #define CLOCKUPDATE	30