diff --git a/www/gekko/Makefile b/www/gekko/Makefile
index 5190fbb00ebb..c2ca3f8d329f 100644
--- a/www/gekko/Makefile
+++ b/www/gekko/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gekko
 PORTVERSION=	0.6.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gekkoware
@@ -17,7 +18,7 @@ COMMENT=	Open Source solution for your Web Content Management
 
 NO_BUILD=	yes
 USE_PHP=	bz2 gd mysql pcre session zlib
-GEKKODIR?=	www/data-dist/gekko
+GEKKODIR?=	www/${PORTNAME}
 PLIST_SUB=	GEKKODIR=${GEKKODIR}
 
 do-install:
diff --git a/www/gekko/pkg-plist b/www/gekko/pkg-plist
index 1e0e91ecc9a4..cac18de25fce 100644
--- a/www/gekko/pkg-plist
+++ b/www/gekko/pkg-plist
@@ -697,4 +697,3 @@
 @dirrm %%GEKKODIR%%/templates/default
 @dirrm %%GEKKODIR%%/templates
 @dirrmtry %%GEKKODIR%%
-@dirrmtry www/data-dist