diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index d1ad66096ee..0cef12e2369 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2012/12/29 13:55:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2013/01/07 08:08:39 dcoppa Exp $
 
 COMMENT =	clone of rxvt with Unicode and Xft support
 
 DISTNAME =	rxvt-unicode-9.16
-REVISION =	0
+REVISION =	1
 CATEGORIES =	x11
 
 EXTRACT_SUFX =	.tar.bz2
@@ -12,7 +12,7 @@ MASTER_SITES =	http://dist.schmorp.de/rxvt-unicode/ \
 
 HOMEPAGE =	http://software.schmorp.de/pkg/rxvt-unicode.html
 
-MAINTAINER =	LEVAI Daniel <leva@ecentrum.hu>
+MAINTAINER =	David Coppa <dcoppa@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -34,9 +34,10 @@ CONFIGURE_ARGS =	--enable-256-color \
 			--enable-perl \
 			--enable-pixbuf \
 			--enable-startup-notification \
+			--enable-utmp \
+			--enable-wtmp \
 			--with-term=rxvt-256color
-# XXX utmp recording should also be enabled, as per rxvt (which will
-# also require setgid utmp), but this currently fails
+CONFIGURE_ENV +=	pt_cv_tty_group=yes
 
 # missing locale support
 CONFIGURE_ARGS +=	--disable-xim
diff --git a/x11/rxvt-unicode/patches/patch-libptytty_src_fdpass_C b/x11/rxvt-unicode/patches/patch-libptytty_src_fdpass_C
new file mode 100644
index 00000000000..716ce7d7b8a
--- /dev/null
+++ b/x11/rxvt-unicode/patches/patch-libptytty_src_fdpass_C
@@ -0,0 +1,16 @@
+$OpenBSD: patch-libptytty_src_fdpass_C,v 1.1 2013/01/07 08:08:39 dcoppa Exp $
+
+Unbreak utmp support. Fix error:
+"protocol error while reading pty/tty fds from helper process, aborting."
+
+--- libptytty/src/fdpass.C.orig	Sat May 19 03:57:47 2012
++++ libptytty/src/fdpass.C	Wed Jan  2 17:08:40 2013
+@@ -103,7 +103,7 @@ ptytty::recv_fd (int socket)
+ 
+   if (recvmsg (socket, &msg, 0) >  0
+       && data                   == 0
+-      && msg.msg_controllen     >= CMSG_SPACE (sizeof (int)))
++      && msg.msg_controllen     >= CMSG_LEN (sizeof (int)))
+     {
+       cmsghdr *cmsg = CMSG_FIRSTHDR (&msg);
+ 
diff --git a/x11/rxvt-unicode/pkg/PLIST b/x11/rxvt-unicode/pkg/PLIST
index 06bb4e947d7..683c98cdfdd 100644
--- a/x11/rxvt-unicode/pkg/PLIST
+++ b/x11/rxvt-unicode/pkg/PLIST
@@ -1,7 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.5 2012/12/28 12:12:38 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.6 2013/01/07 08:08:39 dcoppa Exp $
+@mode g+s
+@group utmp
 @bin bin/urxvt
+@mode
+@group
 @bin bin/urxvtc
+@mode g+s
+@group utmp
 @bin bin/urxvtd
+@mode
+@group
 lib/urxvt/
 lib/urxvt/perl/
 lib/urxvt/perl/background