diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index a3331720fd7..3deab15373e 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,21 +1,21 @@
-# $OpenBSD: Makefile,v 1.9 1999/10/06 20:32:55 rohee Exp $
+# $OpenBSD: Makefile,v 1.10 1999/10/31 18:47:40 brad Exp $
 
 DISTNAME=	rxvt-2.6.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		ftp://mason.primenet.com.au/pub/rxvt/ \
-		http://wm.current.nu/files/ \
-		ftp://ftp.nstu.ru/pub/sources/x/
+		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR= X11/terms
 
 MAINTAINER=	jasoni@openbsd.org
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-xgetdefault --with-term=rxvt
+CONFIGURE_ARGS+=--enable-utmp --enable-wtmp \
+		--with-xpm --enable-xpm-background --enable-transparency \
+		--enable-xgetdefault --with-term="rxvt"
 
-# Various compile time options you may want to configure.
-#CONFIGURE_ARGS+= --enable-utmp \
-#		--enable-wtmp \
-#		--enable-menubar
+post-install:
+	@chmod 4755 ${PREFIX}/bin/rxvt
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt/patches/patch-ab b/x11/rxvt/patches/patch-ab
new file mode 100644
index 00000000000..2fcf7f0a1e0
--- /dev/null
+++ b/x11/rxvt/patches/patch-ab
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Oct 31 11:56:07 1999
++++ Makefile.in	Sun Oct 31 11:56:46 1999
+@@ -9,7 +9,7 @@
+ first_rule: all
+ dummy:
+ 
+-subdirs = src doc rclock src/graphics
++subdirs = src doc # rclock src/graphics
+ 
+ DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
+ 
diff --git a/x11/rxvt/patches/patch-ac b/x11/rxvt/patches/patch-ac
new file mode 100644
index 00000000000..9b8c280f23d
--- /dev/null
+++ b/x11/rxvt/patches/patch-ac
@@ -0,0 +1,20 @@
+--- autoconf/config.h.in.orig	Sun Oct 31 11:58:19 1999
++++ autoconf/config.h.in	Sun Oct 31 11:59:16 1999
+@@ -161,7 +161,7 @@
+ #undef HAVE_UTMP_HOST
+ 
+ /* Define location of utmp */
+-#undef RXVT_UTMP_FILE
++#define RXVT_UTMP_FILE "/var/run/utmp"
+ 
+ /* Define in utmpx.h has struct utmpx */
+ #undef HAVE_STRUCT_UTMPX
+@@ -173,7 +173,7 @@
+ #undef RXVT_UTMPX_FILE
+ 
+ /* Define location of wtmp */
+-#undef RXVT_WTMP_FILE
++#define RXVT_WTMP_FILE "/var/log/wtmp"
+ 
+ /* Define location of wtmpx */
+ #undef RXVT_WTMPX_FILE
diff --git a/x11/rxvt/pkg/PLIST b/x11/rxvt/pkg/PLIST
index 4140161082f..c6c976ae14d 100644
--- a/x11/rxvt/pkg/PLIST
+++ b/x11/rxvt/pkg/PLIST
@@ -1,4 +1,3 @@
 bin/rxvt
-bin/rclock
+@exec chmod 4755 %D/bin/rxvt
 man/man1/rxvt.1
-man/man1/rclock.1