diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 55fd0cf2fcb6..53a76e31def2 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -21,21 +22,24 @@ USE_GNOMENG=	yes
 USE_GNOME=	glib12
 .else
 LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+USE_XLIB=	yes
 .endif
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
+PLIST_SUB=	PREFIX=${PREFIX}
 .if defined(GKRELLM_SERVER_ONLY)
-PLIST_SUB=	CLIENT="@comment "
+PLIST_SUB+=	CLIENT="@comment "
 .else
-PLIST_SUB=	CLIENT=""
-MAN1=		gkrellm.1
+PLIST_SUB+=	CLIENT=""
+#MAN1=		gkrellm.1
 .endif
 MAN8=		gkrellmd.8
 DOCS=		COPYRIGHT CREDITS README Themes.html
 
+MAN1PREFIX=	${X11BASE}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 300000
@@ -45,23 +49,32 @@ ALL_TARGET=	freebsd
 .endif
 INSTALL_TARGET=	install_netbsd
 
-MAKE_ENV+=	LOCALEDIR=${PREFIX}/share/locale INCLUDEDIR=${PREFIX}/include \
-		INSTALLDIR=${PREFIX}/bin SINSTALLDIR=${PREFIX}/bin \
-		MANDIR=${MANPREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8
+MAKE_ENV+=	LOCALEDIR=${X11BASE}/share/locale \
+		INCLUDEDIR=${X11BASE}/include \
+		INSTALLDIR=${X11BASE}/bin SINSTALLDIR=${PREFIX}/sbin \
+		MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8
 .if defined(GKRELLM_SERVER_ONLY)
 MAKE_ENV+=	glib12=1
 .endif
 
-CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm2/themes\"' \
-		-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins\"' \
+CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${X11BASE}/share/gkrellm2/themes\"' \
+		-DSYSTEM_PLUGINS_DIR='\"${X11BASE}/libexec/gkrellm2/plugins\"' \
 		-DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"'
 
+pre-everything:
+.if !defined(GKRELLM_SERVER_ONLY)
+	@${ECHO} ""
+	@${ECHO} "You may use GKRELLM_SERVER_ONLY=yes to build gkrellmd only."
+	@${ECHO} ""
+.endif
+
 post-install:
 .if defined(GKRELLM_SERVER_ONLY)
 	${INSTALL_MAN} ${WRKSRC}/gkrellmd.1 ${MANPREFIX}/man/man8/gkrellmd.8
 .else
-	@${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins
-	@${MKDIR} ${PREFIX}/share/gkrellm2/themes
+	@${MKDIR} ${X11BASE}/libexec/gkrellm2/plugins
+	@${MKDIR} ${X11BASE}/share/gkrellm2/themes
+	@${GZIP_CMD} ${MAN1PREFIX}/man/man1/gkrellm.1
 .endif
 	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
 		${FILESDIR}/gkrellmd.sh > ${PREFIX}/etc/rc.d/gkrellmd.sh.sample
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 9978b38da5ad..ce5fd325dd8e 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -1,11 +1,18 @@
-%%CLIENT%%bin/gkrellm
-bin/gkrellmd
-%%CLIENT%%include/gkrellm2/gkrellm.h
-%%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
+sbin/gkrellmd
 %%PORTDOCS%%share/doc/gkrellm/COPYRIGHT
 %%PORTDOCS%%share/doc/gkrellm/CREDITS
 %%PORTDOCS%%share/doc/gkrellm/README
 %%PORTDOCS%%share/doc/gkrellm/Themes.html
+%%PORTDOCS%%@dirrm share/doc/gkrellm
+@unexec if cmp -s %D/etc/gkrellmd.conf %D/etc/gkrellmd.conf.sample; then rm -f %D/etc/gkrellmd.conf; fi
+etc/gkrellmd.conf.sample
+@exec [ -f %B/gkrellmd.conf ] || cp %B/%f %B/gkrellmd.conf
+etc/rc.d/gkrellmd.sh.sample
+%%CLIENT%%@cwd %%X11BASE%%
+%%CLIENT%%man/man1/gkrellm.1.gz
+%%CLIENT%%bin/gkrellm
+%%CLIENT%%include/gkrellm2/gkrellm.h
+%%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
 %%CLIENT%%share/locale/de/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/es/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/fr/LC_MESSAGES/gkrellm.mo
@@ -14,11 +21,6 @@ bin/gkrellmd
 %%CLIENT%%share/locale/ru/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/sl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/sv/LC_MESSAGES/gkrellm.mo
-%%PORTDOCS%%@dirrm share/doc/gkrellm
-@unexec if cmp -s %D/etc/gkrellmd.conf %D/etc/gkrellmd.conf.sample; then rm -f %D/etc/gkrellmd.conf; fi
-etc/gkrellmd.conf.sample
-@exec [ -f %B/gkrellmd.conf ] || cp %B/%f %B/gkrellmd.conf
-etc/rc.d/gkrellmd.sh.sample
 %%CLIENT%%@dirrm include/gkrellm2
 %%CLIENT%%@exec mkdir -p %D/libexec/gkrellm2/plugins
 %%CLIENT%%@exec mkdir -p %D/share/gkrellm2/themes
@@ -26,3 +28,4 @@ etc/rc.d/gkrellmd.sh.sample
 %%CLIENT%%@unexec rmdir %D/libexec/gkrellm2 2>/dev/null || true
 %%CLIENT%%@unexec rmdir %D/share/gkrellm2/themes 2>/dev/null || true
 %%CLIENT%%@unexec rmdir %D/share/gkrellm2 2>/dev/null || true
+%%CLIENT%%@cwd %%PREFIX%%