diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 63c575178384..072a6eb85244 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	mrxvt
 PORTVERSION=	0.4.2
 PORTREVISION=	10
 CATEGORIES=	x11
 MASTER_SITES=	SF/materm/${PORTNAME}%20source/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tabbed version of rxvt
 WWW=		http://materm.sourceforge.net/
 
-LIB_DEPENDS=	libpng.so:graphics/png
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	mrxvt-0.5.*
+LIB_DEPENDS=	libpng.so:graphics/png
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-lastlog --disable-wtmp
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-USES=		cpe jpeg tar:tgz xorg
+USES=		cpe jpeg localbase tar:tgz xorg
 CPE_VENDOR=	${PORTNAME}_project
 USE_XORG=	x11
 
-OPTIONS_DEFINE=	DOCS JAPANESE XFT
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-lastlog --disable-wtmp
 
-JAPANESE_CONFIGURE_ON=	--enable-xim --enable-cjk --with-encoding=eucj
-XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
-XFT_CONFIGURE_ENABLE=	xft
+CONFLICTS=	mrxvt-0.5.*
 
 PORTDOCS=	TIPS \
 		README.greek \
 		README.menu \
 		README.xvt \
 		xdefaults-sample.txt \
 		xterm.seq \
 		mrxvt.vbs \
 		mrxvtset.pl
 
+OPTIONS_DEFINE=	DOCS JAPANESE XFT
+
+JAPANESE_DESC=	Japanese Language support
+
+JAPANESE_CONFIGURE_ON=	--enable-xim --enable-cjk --with-encoding=eucj
+XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
+XFT_CONFIGURE_ENABLE=	xft
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MXFT} && ${PORT_OPTIONS:MJAPANESE}
 USES+=		iconv
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no
 .else
 CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=yes
 .endif
 
-post-install:
-	${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt
-
 .include <bsd.port.post.mk>
diff --git a/x11/mrxvt/files/patch-src-logging.c b/x11/mrxvt/files/patch-src-logging.c
index 281cfc5f6478..b4994372c607 100644
--- a/x11/mrxvt/files/patch-src-logging.c
+++ b/x11/mrxvt/files/patch-src-logging.c
@@ -1,25 +1,25 @@
---- src/logging.c.orig	2010-01-15 17:27:05.000000000 +0100
-+++ src/logging.c	2010-01-15 17:29:39.000000000 +0100
-@@ -114,14 +114,22 @@
+--- src/logging.c.orig	2004-11-11 00:20:28 UTC
++++ src/logging.c
+@@ -114,14 +114,22 @@ rxvt_makeutent(rxvt_t *r, int page, const char *pty, c
      if (!STRNCMP(pty, "/dev/", 5))
  		pty += 5;		/* skip /dev/ prefix */
  
 +#ifdef PTYS_ARE_OPENPTY
 +    if (!STRNCMP(pty, "pts", 3) || !STRNCMP(pty, "tty", 3)) {
 +#else
      if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) {
 +#endif
  		STRNCPY(ut_id, (pty + 3), sizeof(ut_id));
      }
  #ifdef HAVE_UTMP_PID
      else if (sscanf(pty, "pts/%d", &i) == 1)
  		sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
  #endif
 +#ifdef PTYS_ARE_OPENPTY
 +    else if (!STRNCMP(pty, "pts", 3) || !STRNCMP(pty, "tty", 3)) {
 +#else
      else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
 +#endif
  		rxvt_print_error("can't parse tty name \"%s\"", pty);
  		return;
      }
diff --git a/x11/mrxvt/files/patch-src-main.c b/x11/mrxvt/files/patch-src-main.c
index 52ba4111e025..b66e07b8e82e 100644
--- a/x11/mrxvt/files/patch-src-main.c
+++ b/x11/mrxvt/files/patch-src-main.c
@@ -1,11 +1,11 @@
---- src/main.c.orig	Fri Jul 22 19:42:38 2005
-+++ src/main.c	Fri Jul 22 19:43:03 2005
-@@ -1568,7 +1568,7 @@
+--- src/main.c.orig	2005-08-31 05:30:41 UTC
++++ src/main.c
+@@ -1568,7 +1568,7 @@ rxvt_set_utf8_property (rxvt_t* r, Atom prop, Window w
  void
  rxvt_set_utf8_property (rxvt_t* r, Atom prop, Window win, const char* str)
  {
 -#ifdef HAVE_WCHAR_H
 +#ifdef HAVE_WCHAR_H && _FreeBSD_version >= 500000
  	wchar_t*	ws = rxvt_mbstowcs (str);
  	char*		s = rxvt_wcstoutf8 (ws);
  
diff --git a/x11/mrxvt/files/patch-src-strings.c b/x11/mrxvt/files/patch-src-strings.c
index 3962ba672e09..ace2f0e6596c 100644
--- a/x11/mrxvt/files/patch-src-strings.c
+++ b/x11/mrxvt/files/patch-src-strings.c
@@ -1,18 +1,18 @@
---- src/strings.c.orig	Fri Jul 22 19:49:43 2005
-+++ src/strings.c	Fri Jul 22 19:50:40 2005
+--- src/strings.c.orig	2005-03-21 00:42:08 UTC
++++ src/strings.c
 @@ -44,6 +44,7 @@
  
  #ifdef HAVE_WCHAR_H
  /* EXTPROTO */
 +#if _FreeBSD_version >= 500000
  char*
  rxvt_wcstombs (const wchar_t* str, int len)
  {
-@@ -70,6 +71,7 @@
+@@ -70,6 +71,7 @@ rxvt_wcstombs (const wchar_t* str, int len)
  
  	return r;
  }
 +#endif
  
  
  /* EXTPROTO */
diff --git a/x11/mrxvt/pkg-plist b/x11/mrxvt/pkg-plist
index b8ae961a7b1c..a9739c43eb62 100644
--- a/x11/mrxvt/pkg-plist
+++ b/x11/mrxvt/pkg-plist
@@ -1,8 +1,8 @@
-bin/mrxvt
+@(,,4511) bin/mrxvt
 man/man1/mrxvt.1.gz
 share/pixmaps/mrxvt-csh.png
 share/pixmaps/mrxvt-csh.xpm
 share/pixmaps/mrxvt-root.png
 share/pixmaps/mrxvt-root.xpm
 share/pixmaps/mrxvt.png
 share/pixmaps/mrxvt.xpm