diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile
index 06118a141d6e..2880fcd75ca2 100644
--- a/sysutils/xorriso/Makefile
+++ b/sysutils/xorriso/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	xorriso
-PORTVERSION=	1.4.8
+PORTVERSION=	1.5.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://files.libburnia-project.org/releases/
 DISTNAME=	libisoburn-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ndowens@yahoo.com
 COMMENT=	ISO image manipulation tool based on Libburnia
 
 LICENSE=	GPLv2+
@@ -17,14 +17,43 @@ LIB_DEPENDS=	libburn.so:devel/libburn \
 		libisofs.so:devel/libisofs
 
 GNU_CONFIGURE=	yes
-USES=		gmake iconv libtool libedit pathfix pkgconfig shebangfix tk
+USES=		gmake iconv libtool libedit pathfix pkgconfig shebangfix
 SHEBANG_FILES=	frontend/xorriso-tcltk
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 INFO=		xorrecord xorriso xorrisofs
 
+PORTDOCS=	*.wiki
+
+OPTIONS_DEFINE=	CDIO DEBUG DOCS LIBACL LIBJTE READLINE TK XATTR ZLIB
+OPTIONS_DEFAULT=LIBACL LIBJTE READLINE XATTR ZLIB
+OPTIONS_SUB=	yes
+
+LIBACL_DESC=	ACL Support
+LIBJTE_DESC=	Jigdo Support
+XATTR_DESC=	Extended file attribute Support
+
+CDIO_CONFIGURE_ENABLE=		libcdio
+DEBUG_CONFIGURE_ENABLE=		debug
+LIBACL_CONFIGURE_ENABLE=	libacl
+LIBJTE_CONFIGURE_ENABLE=	libjte
+READLINE_CONFIGURE_ENABLE=	libreadline
+TK_USES=			tk
+TK_INFO=			xorriso-tcltk
+XATTR_CONFIGURE_ENABLE=		xattr
+ZLIB_CONFIGURE_ENABLE=		zlib
+
 post-patch:
 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
 
+do-install-TK-off:
+	${RM} ${STAGEDIR}${PREFIX}/bin/xorriso-tcltk \
+		${STAGEDIR}${PREFIX}/man/man1/xorriso-tcltk.1.gz \
+		${STAGEDIR}${PREFIX}/info/xorriso-tcltk.info
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/sysutils/xorriso/distinfo b/sysutils/xorriso/distinfo
index 1723b333adc6..0e1bebd23a11 100644
--- a/sysutils/xorriso/distinfo
+++ b/sysutils/xorriso/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505232969
-SHA256 (libisoburn-1.4.8.tar.gz) = 91cf50473f0f19400629515974bda441545aaae29862dcbbdb28d87b821ca5a5
-SIZE (libisoburn-1.4.8.tar.gz) = 1537097
+TIMESTAMP = 1537239632
+SHA256 (libisoburn-1.5.0.tar.gz) = dac1f5629c404df236453b2b6a2671473900776c6a5707e5b8acae20385c1de5
+SIZE (libisoburn-1.5.0.tar.gz) = 1550656
diff --git a/sysutils/xorriso/pkg-descr b/sysutils/xorriso/pkg-descr
index 18a67e619dec..74312fea0e52 100644
--- a/sysutils/xorriso/pkg-descr
+++ b/sysutils/xorriso/pkg-descr
@@ -8,5 +8,5 @@ information of existing ISO images and it writes the session results
 to optical media or to filesystem objects.  Vice versa xorriso is
 able to restore file objects from ISO 9660 filesystems.
 
-WWW: http://libburnia-project.org/
-WWW: http://scdbackup.sourceforge.net/xorriso_eng.html
+WWW: https://dev.lovelyhq.com/libburnia/web/wikis/Xorriso
+WWW: https://www.gnu.org/software/xorriso/
diff --git a/sysutils/xorriso/pkg-plist b/sysutils/xorriso/pkg-plist
index a84002509990..3d066f68277c 100644
--- a/sysutils/xorriso/pkg-plist
+++ b/sysutils/xorriso/pkg-plist
@@ -1,15 +1,16 @@
 bin/osirrox
 bin/xorrecord
 bin/xorriso
-bin/xorriso-tcltk
+%%TK%%bin/xorriso-tcltk
 bin/xorrisofs
 include/libisoburn/libisoburn.h
 include/libisoburn/xorriso.h
 lib/libisoburn.a
 lib/libisoburn.so
 lib/libisoburn.so.1
-lib/libisoburn.so.1.105.0
+lib/libisoburn.so.1.107.0
 libdata/pkgconfig/libisoburn-1.pc
 man/man1/xorrecord.1.gz
+%%TK%%man/man1/xorriso-tcltk.1.gz
 man/man1/xorriso.1.gz
 man/man1/xorrisofs.1.gz