diff --git a/security/Makefile b/security/Makefile
index c45e20d98aa0..1c7ab0546bb6 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -782,6 +782,7 @@
     SUBDIR += pinentry-gnome3
     SUBDIR += pinentry-gtk2
     SUBDIR += pinentry-qt4
+    SUBDIR += pinentry-qt5
     SUBDIR += pinentry-tty
     SUBDIR += pixiewps
     SUBDIR += pkcrack
diff --git a/security/pinentry-qt5/Makefile b/security/pinentry-qt5/Makefile
new file mode 100644
index 000000000000..543c51974f22
--- /dev/null
+++ b/security/pinentry-qt5/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTNAME=	pinentry
+PORTREVISION=	0
+
+COMMENT=	Qt 5 version of the GnuPG password dialog
+
+PINENTRY_GUI=	qt5
+
+MASTERDIR=	${.CURDIR}/../pinentry
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index a99dd6b40be5..37e208fa1241 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 PLIST_FILES=	bin/pinentry
 
 OPTIONS_SINGLE=	FRONTEND
-OPTIONS_SINGLE_FRONTEND=	TTY NCURSES GTK2 QT4 GNOME3
+OPTIONS_SINGLE_FRONTEND=	TTY NCURSES GTK2 QT4 QT5 GNOME3
 OPTIONS_DEFAULT=	TTY
 
 FRONTEND_DESC=	Default frontend
@@ -37,9 +37,13 @@ PINENTRY_GTK2=	pinentry-gtk-2
 GTK2_RUN_DEPENDS=	${PINENTRY_GTK2}:security/pinentry-gtk2
 
 QT4_DESC=	Qt 4 frontend
-PINENTRY_QT4=	pinentry-qt
+PINENTRY_QT4=	pinentry-qt4
 QT4_RUN_DEPENDS=	${PINENTRY_QT4}:security/pinentry-qt4
 
+QT5_DESC=	Qt 5 frontend
+PINENTRY_QT5=	pinentry-qt5
+QT5_RUN_DEPENDS=	${PINENTRY_QT5}:security/pinentry-qt5 
+
 GNOME3_DESC=	GNOME 3 frontend
 PINENTRY_GNOME3=	pinentry-gnome3
 GNOME3_RUN_DEPENDS=	${PINENTRY_GNOME3}:security/pinentry-gnome3
@@ -87,8 +91,15 @@ CONFIGURE_ARGS+=--disable-pinentry-gnome3
 .if ${PINENTRY_GUI} == "qt4"
 USES+=		compiler:c++11-lib
 USE_QT4=	gui moc_build
-PLIST_FILES=	bin/pinentry-qt
-CONFIGURE_ARGS+=--disable-pinentry-qt5
+PLIST_FILES=	bin/pinentry-qt4
+CONFIGURE_ARGS+=--disable-pinentry-qt5 \
+		--program-suffix=4
+.elif ${PINENTRY_GUI} == "qt5"
+USES+=		compiler:c++11-lib
+USE_QT5=	core gui widgets buildtools_build
+PLIST_FILES=	bin/pinentry-qt5
+CONFIGURE_ARGS+=--enable-pinentry-qt5 \
+		--program-suffix=5
 .else
 CONFIGURE_ARGS+=--disable-pinentry-qt --disable-pinentry-qt5
 .endif