diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index e3adfe1b0b34..f72641ade21d 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.23
 PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.cyberspace.org/~elfguy00/
-DISTNAME=	GXedit${PORTVERSION}
+DISTNAME=	GXedit-${PORTVERSION}
 
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	A simple GTK+ editor
@@ -18,6 +18,7 @@ COMMENT=	A simple GTK+ editor
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gtk12
+WRKSRC=		${WRKDIR}/GXedit${PORTVERSION}
 
 ALL_TARGET=	gxedit
 
diff --git a/editors/gxedit/pkg-plist b/editors/gxedit/pkg-plist
index 2073355419ea..3f1b6130e175 100644
--- a/editors/gxedit/pkg-plist
+++ b/editors/gxedit/pkg-plist
@@ -3,14 +3,14 @@ bin/ftp-put.sh
 bin/ftp.sh
 bin/gtk-shell
 bin/gxedit
-share/gxedit/popmail.scr
-share/gxedit/traceroute.scr
-share/gxedit/userinfo.scr
-share/gxedit/www.scr
-share/doc/gxedit/charmap.txt
-share/doc/gxedit/manual.ps
-share/doc/gxedit/manual.txt
-share/doc/gxedit/quickref.ps
-share/doc/gxedit/quickref.txt
-@dirrm share/gxedit/
-@dirrm share/doc/gxedit/
+%%DATADIR%%/popmail.scr
+%%DATADIR%%/traceroute.scr
+%%DATADIR%%/userinfo.scr
+%%DATADIR%%/www.scr
+%%DOCSDIR%%/charmap.txt
+%%DOCSDIR%%/manual.ps
+%%DOCSDIR%%/manual.txt
+%%DOCSDIR%%/quickref.ps
+%%DOCSDIR%%/quickref.txt
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%