diff --git a/astro/mkgmap/Makefile b/astro/mkgmap/Makefile
index da3b6a33d7fe..d858da4cf5fe 100644
--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkgmap
-PORTVERSION=	r2487
+PORTVERSION=	r2648
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -17,14 +17,14 @@ JAVA_VERSION=	1.6+
 
 SUB_FILES=	${PORTNAME}.sh
 
-PLIST_FILES=	bin/${PORTNAME} ${JAVAJARDIR:C,${PREFIX}/?,,}/${PORTNAME}.jar
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 do-install:
-	${MKDIR} ${JAVAJARDIR}/
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${JAVAJARDIR}/
+	${MKDIR} ${DATADIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}/lib/
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
diff --git a/astro/mkgmap/distinfo b/astro/mkgmap/distinfo
index 056f1674187a..f904d4b47376 100644
--- a/astro/mkgmap/distinfo
+++ b/astro/mkgmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkgmap-r2487.tar.gz) = 20447f8182eeddf86b4d79b126f6adf4ac24b098f8fdcf910879a5af6f2dc47b
-SIZE (mkgmap-r2487.tar.gz) = 2447326
+SHA256 (mkgmap-r2648.tar.gz) = b5f3b8757acee845289a648761dcefedeaa14e4677ed526578e4137bcb9814a7
+SIZE (mkgmap-r2648.tar.gz) = 2751777
diff --git a/astro/mkgmap/files/mkgmap.sh.in b/astro/mkgmap/files/mkgmap.sh.in
index d2c5840351b2..1b3b0db67722 100644
--- a/astro/mkgmap/files/mkgmap.sh.in
+++ b/astro/mkgmap/files/mkgmap.sh.in
@@ -3,7 +3,5 @@
 # $FreeBSD: /tmp/pcvs/ports/astro/mkgmap/files/mkgmap.sh.in,v 1.2 2012-01-09 18:12:03 amdmi3 Exp $
 
 JAVA="%%LOCALBASE%%/bin/java"
-JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
 
-exec "${JAVA}" -jar "${JARPATH}/mkgmap.jar" "$@"
+exec "${JAVA}" -jar %%DATADIR%%/mkgmap.jar "$@"
diff --git a/astro/mkgmap/pkg-plist b/astro/mkgmap/pkg-plist
new file mode 100644
index 000000000000..f31aa0959def
--- /dev/null
+++ b/astro/mkgmap/pkg-plist
@@ -0,0 +1,7 @@
+bin/mkgmap
+%%DATADIR%%/lib/fastutil-6.5.2-mkg.1.jar
+%%DATADIR%%/lib/osmpbf-1.1.1-754a33af.jar
+%%DATADIR%%/lib/protobuf-java-2.4.1.jar
+%%DATADIR%%/mkgmap.jar
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%