Index: Mk/bsd.qt.mk
===================================================================
--- Mk/bsd.qt.mk
+++ Mk/bsd.qt.mk
@@ -175,7 +175,7 @@
 .  if ${_QT_VERSION:M4*}
 _EXTRA_PATCHES_QT4=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
 					${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool
-# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html 
+# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
 _EXTRA_PATCHES_QT4+=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6
 .  else
 _EXTRA_PATCHES_QT5=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
@@ -316,8 +316,8 @@
 				qtestlib qvfb rcc uic uic3 xmlpatterns-tool
 
 _USE_QT5_ONLY=	3d buildtools canvas3d charts concurrent connectivity \
-				core datavis3d declarative-render2d examples gamepad \
-				graphicaleffects location paths phonon4 printsupport \
+				core datavis3d declarative-render2d diag examples gamepad \
+				graphicaleffects location paths phonon4 plugininfo printsupport \
 				qdbus qdoc qdoc-data qev qml quick quickcontrols \
 				quickcontrols2 scxml sensors serialbus serialport \
 				sql-tds uiplugin uitools virtualkeyboard webchannel \
@@ -392,6 +392,9 @@
 designer_PORT=		devel/${_QT_RELNAME}-designer
 designer_PATH=		${QT_BINDIR}/designer
 
+diag_PORT=		sysutils/${_QT_RELNAME}-qtdiag
+diag_PATH=		${QT_BINDIR}/qtdiag
+
 doc_PORT=			misc/${_QT_RELNAME}-doc
 doc_PATH=			${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
 
@@ -466,6 +469,9 @@
 
 phonon-gst_PORT=	multimedia/phonon-gstreamer
 phonon-gst_PATH=	${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so
+
+plugininfo_PORT=		sysutils/${_QT_RELNAME}-qtplugininfo
+plugininfo_PATH=		${QT_BINDIR}/qtplugininfo
 
 porting_PORT=		devel/${_QT_RELNAME}-porting
 porting_PATH=		${QT_BINDIR}/qt3to4
Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -912,7 +912,9 @@
     SUBDIR += qlogtools
     SUBDIR += qpxtool
     SUBDIR += qsynergy
+    SUBDIR += qt5-qtdiag
     SUBDIR += qt5-qtpaths
+    SUBDIR += qt5-qtplugininfo
     SUBDIR += qtpass
     SUBDIR += quicksynergy
     SUBDIR += qzeitgeist
Index: sysutils/qt5-qtdiag/Makefile
===================================================================
--- /dev/null
+++ sysutils/qt5-qtdiag/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	qtdiag
+DISTVERSION=	${QT5_VERSION}
+CATEGORIES=	sysutils
+PKGNAMEPREFIX=	qt5-
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Tool for reporting diagnostic information about Qt and its environment
+
+USE_QT5=	core gui
+QT_DIST=	tools
+USES=		qmake
+
+PLIST_FILES=	${QT_BINDIR}/qtdiag
+
+# Similarly to x11/qt5-qev, it makes more sense to just run the build system
+# from the qtdiag directory. If we run it from the top of the source tree, it
+# will look for a lot more dependencies for other tools such as lupdate, which
+# we do not really have to depend on.
+WRKSRC_SUBDIR=	src/${PORTNAME}
+post-patch:
+	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
+
+.include <bsd.port.mk>
Index: sysutils/qt5-qtdiag/pkg-descr
===================================================================
--- /dev/null
+++ sysutils/qt5-qtdiag/pkg-descr
@@ -0,0 +1 @@
+Tool for reporting diagnostic information about Qt and its environment
Index: sysutils/qt5-qtplugininfo/Makefile
===================================================================
--- /dev/null
+++ sysutils/qt5-qtplugininfo/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	qtplugininfo
+DISTVERSION=	${QT5_VERSION}
+CATEGORIES=	sysutils
+PKGNAMEPREFIX=	qt5-
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt5 plugin metadata dumper
+
+USE_QT5=	core
+QT_DIST=	tools
+USES=		qmake
+
+PLIST_FILES=	${QT_BINDIR}/qtplugininfo
+
+# Similarly to x11/qt5-qev, it makes more sense to just run the build system
+# from the qtplugininfo directory. If we run it from the top of the source tree, it
+# will look for a lot more dependencies for other tools such as lupdate, which
+# we do not really have to depend on.
+WRKSRC_SUBDIR=	src/${PORTNAME}
+post-patch:
+	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
+
+.include <bsd.port.mk>
Index: sysutils/qt5-qtplugininfo/pkg-descr
===================================================================
--- /dev/null
+++ sysutils/qt5-qtplugininfo/pkg-descr
@@ -0,0 +1 @@
+Qt5 plugin metadata dumper