diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index 33afc984095f..6fddc42e632a 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mapyrus
-PORTVERSION=	1.105
+PORTVERSION=	1.201
 PORTREVISION=	0
 CATEGORIES=	graphics print java
 MASTER_SITES=	SF
@@ -33,15 +33,19 @@ MAPYRUSDOCS=	${PORTNAME}.pdf
 FIND_DATA=	-type f -not \( -iname "copying" -or -iname "*.tex" \)
 FIND_HERE=	userdoc
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${DATADIR}/${MAPYRUSJAR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${DOCSDIR}/
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKDIR} && ${FIND} ${FIND_HERE} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${EXAMPLESDIR} \;
 .endif
diff --git a/graphics/mapyrus/distinfo b/graphics/mapyrus/distinfo
index 205f9ea6791b..768666506271 100644
--- a/graphics/mapyrus/distinfo
+++ b/graphics/mapyrus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mapyrus-1.105.zip) = 81cf7ded80435fb66113f8c1f9d0c8ad8fc869b9c1a80a7b7aefbe5e9e271336
-SIZE (mapyrus-1.105.zip) = 3433599
+SHA256 (mapyrus-1.201.zip) = 0e535b4ce9b1d6b882495e661c9556aa47ced75267baf7e4cb3bb982522ca5ed
+SIZE (mapyrus-1.201.zip) = 5048784
diff --git a/graphics/mapyrus/files/mapyrus.in b/graphics/mapyrus/files/mapyrus.in
index 61a322fdd430..5f96f658a9c4 100644
--- a/graphics/mapyrus/files/mapyrus.in
+++ b/graphics/mapyrus/files/mapyrus.in
@@ -5,5 +5,11 @@ if [ -z "${DISPLAY}" ]; then
 else
     JAVA_AWT_HEADLESS=""
 fi
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/%%MAPYRUSJAR%%" "$@"
+if [ -z "$1" ]; then
+    MAPYRUS_ARGS="-h"
+else
+    MAPYRUS_ARGS="$@"
+fi
+JAVA_VERSION="1.5+" \
+	exec "/usr/local/bin/java" ${JAVA_AWT_HEADLESS} -jar "/usr/local/share/java/mapyrus/mapyrus.jar" ${MAPYRUS_ARGS}
+	
\ No newline at end of file
diff --git a/graphics/mapyrus/pkg-plist b/graphics/mapyrus/pkg-plist
index 82ceeed0e9d9..72bd0fa29187 100644
--- a/graphics/mapyrus/pkg-plist
+++ b/graphics/mapyrus/pkg-plist
@@ -60,6 +60,7 @@ bin/mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage1.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage2.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage3.mapyrus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage4.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgradient.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialhtmlpage1.mapyrus
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialhtmlpage2.mapyrus