diff --git a/textproc/qrcodegen/Makefile b/textproc/qrcodegen/Makefile
index da2d1268ce1c..00c819196450 100644
--- a/textproc/qrcodegen/Makefile
+++ b/textproc/qrcodegen/Makefile
@@ -1,37 +1,45 @@
 PORTNAME=	qrcodegen
 DISTVERSION=	1.14.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc java
-MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
-DISTNAME=	${PORTNAME}_${DISTVERSION}
+MASTER_SITES=	LOCAL/ronald \
+		https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-ri/2.3.1/:jaxb
+DISTFILES=	${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX} \
+		jaxb-ri-2.3.1.zip:jaxb
+EXTRACT_ONLY=	${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	GUI to generate QR codes
 WWW=		https://sites.google.com/site/qrcodeforwn/home/qr-code-generator-for-wireless-networks
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		java zip
-JAVA_VERSION=	8
 
 DESKTOP_ENTRIES=	"Portable QR-Code Generator" \
 			"${COMMENT}" \
 			"" \
 			"${PORTNAME}" \
 			"Utility;2DGraphics;Java;" \
 			false
 EXTRACT_BEFORE_ARGS=	-jqo
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${PORTNAME}
+SUB_LIST=	JAVA=${JAVA} JAXB_FILES="${JAXB_FILES}"
 
 INSTALLFILES=	FAQ.txt Installation.txt NOTICE QRCodeGen.jar Version.html
+JAXB_FILES=	jaxb-api.jar jaxb-runtime.jar istack-commons-runtime.jar javax.activation-api.jar
+
+post-extract:
+	unzip -q -d ${WRKDIR}/jaxb ${DISTDIR}/jaxb-ri-2.3.1.zip
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${INSTALLFILES:C|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${JAXB_FILES:C|^|${WRKDIR}/jaxb/jaxb-ri/mod/|} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/qrcodegen/distinfo b/textproc/qrcodegen/distinfo
index eb49c5ef9bcc..a30a81a8f9c2 100644
--- a/textproc/qrcodegen/distinfo
+++ b/textproc/qrcodegen/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1481205035
+TIMESTAMP = 1775664530
 SHA256 (qrcodegen_1.14.2.zip) = 48144b8d2f309f4324a85fcd7261244581678fb438a0a49f3a84b8ffcf07b09b
 SIZE (qrcodegen_1.14.2.zip) = 697748
+SHA256 (jaxb-ri-2.3.1.zip) = 87e6c348b47d5e0af6b168cc55e98e1463d59c40758fa234360a537f0c179f24
+SIZE (jaxb-ri-2.3.1.zip) = 5364262
diff --git a/textproc/qrcodegen/files/qrcodegen.in b/textproc/qrcodegen/files/qrcodegen.in
index 4d7042557b37..e3fae846c211 100644
--- a/textproc/qrcodegen/files/qrcodegen.in
+++ b/textproc/qrcodegen/files/qrcodegen.in
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-cd %%DATADIR%%
-export JAVA_VERSION="%%JAVA_VERSION%%"
-exec %%LOCALBASE%%/bin/java -jar QRCodeGen.jar "$@"
-
+CLASSPATH="%%DATADIR%%/QRCodeGen.jar"
+for jar in %%JAXB_FILES%%; do
+	CLASSPATH="${CLASSPATH}:%%DATADIR%%/${jar}"
+done
+export CLASSPATH
+exec %%JAVA%% qrcodegen.Loader "$@"
diff --git a/textproc/qrcodegen/pkg-plist b/textproc/qrcodegen/pkg-plist
index 82eb9d41d353..79e6f79b9227 100644
--- a/textproc/qrcodegen/pkg-plist
+++ b/textproc/qrcodegen/pkg-plist
@@ -1,6 +1,10 @@
 bin/qrcodegen
 %%DATADIR%%/FAQ.txt
 %%DATADIR%%/Installation.txt
 %%DATADIR%%/NOTICE
 %%DATADIR%%/QRCodeGen.jar
 %%DATADIR%%/Version.html
+%%DATADIR%%/jaxb-api.jar
+%%DATADIR%%/jaxb-runtime.jar
+%%DATADIR%%/istack-commons-runtime.jar
+%%DATADIR%%/javax.activation-api.jar