diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index a484fb5ef1d9..1dae10a0e7ae 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
@@ -31,11 +31,11 @@ MOZILLA=	firefox
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
-USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	${X11BASE}/lib/${MOZILLA}
 GCONF_SCHEMAS=	devhelp.schemas
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
@@ -55,13 +55,4 @@ pre-everything::
 	@${ECHO_MSG} "  firefox       "
 	@${ECHO_MSG} ""
 
-post-patch:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		${FILESDIR}/devhelp.sh > ${WRKDIR}/devhelp.sh
-
-post-install:
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/devhelp.sh ${PREFIX}/etc/rc.d/000.devhelp.sh
-	@${LDCONFIG} -m ${X11BASE}/lib/${MOZILLA}
-
 .include <bsd.port.post.mk>
diff --git a/devel/devhelp/files/devhelp.sh b/devel/devhelp/files/devhelp.sh
deleted file mode 100644
index 411ff22fb5f0..000000000000
--- a/devel/devhelp/files/devhelp.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: devhelp
-# REQUIRE: ldconfig
-
-. /etc/rc.subr
-
-name=devhelp
-
-start_cmd=devhelp_start
-stop_cmd=:
-
-[ -z "$devhelp_libdir" ] && devhelp_libdir="%%PREFIX%%/lib/%%MOZILLA%%"
-
-devhelp_start() {
-    if [ -d "$devhelp_libdir" ]; then
-	/sbin/ldconfig -m "$devhelp_libdir"
-    fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index c9ff21e47b8f..6f3906d576ca 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,5 +1,4 @@
 bin/devhelp
-etc/rc.d/000.devhelp.sh
 include/devhelp-1.0/devhelp/dh-base.h
 include/devhelp-1.0/devhelp/dh-book-tree.h
 include/devhelp-1.0/devhelp/dh-error.h
@@ -77,3 +76,5 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/gnome/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw