Index: head/security/Makefile
===================================================================
--- head/security/Makefile
+++ head/security/Makefile
@@ -1227,6 +1227,7 @@
     SUBDIR += softhsm2
     SUBDIR += sops
     SUBDIR += spass
+    SUBDIR += spass-qt5
     SUBDIR += spike-proxy
     SUBDIR += spybye
     SUBDIR += sqlmap
Index: head/security/spass-qt5/Makefile
===================================================================
--- head/security/spass-qt5/Makefile
+++ head/security/spass-qt5/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-qt5
+
+COMMENT=	Secure password generator with a true RNG (Qt5 GUI)
+
+USES=		qmake:no_env qt:5
+USE_QT=		buildtools_build core gui widgets
+
+MASTERDIR=	${.CURDIR}/../spass
+
+PLIST_FILES=	bin/spass-qt
+
+# Delete the CLI-only binary which is already provided via security/spass
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/spass
+
+.include	"${MASTERDIR}/Makefile"
Index: head/security/spass/Makefile
===================================================================
--- head/security/spass/Makefile
+++ head/security/spass/Makefile
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	spass
-PORTVERSION=	3.0
-PORTREVISION=	16
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.2-5
+DISTVERSIONSUFFIX=	-gd38d173
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Secure password generator with a true random number generator
+COMMENT?=	Secure password generator with a true random number generator
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -14,14 +15,17 @@
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
 
+USES+=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	guyru
-GH_TAGNAME=	cb0de64
 
-USES=		cmake compiler:c++11-lang
-
 CMAKE_ARGS=	-DWITH_ALSA:BOOL=off -DWITH_OSS:BOOL=on
 
-PLIST_FILES=	bin/spass
+PLIST_FILES?=	bin/spass
+
+# Disable the Qt5 GUI if we build the master port
+.if !defined(PKGNAMESUFFIX)
+CMAKE_ARGS+=	-DWITH_GUI:BOOL=off
+.endif
 
 .include <bsd.port.mk>
Index: head/security/spass/distinfo
===================================================================
--- head/security/spass/distinfo
+++ head/security/spass/distinfo
@@ -1,2 +1,3 @@
-SHA256 (guyru-spass-3.0-cb0de64_GH0.tar.gz) = 3b3bd505f03645838125377d9db5e2a3bac339c2aba2ed36ff5d95aec1d525ca
-SIZE (guyru-spass-3.0-cb0de64_GH0.tar.gz) = 47733
+TIMESTAMP = 1564168089
+SHA256 (guyru-spass-v3.2-5-gd38d173_GH0.tar.gz) = af2fac7c18e8dea881d65bcf780bfd777353e1aa402462c67a9b6c4e37d71dfa
+SIZE (guyru-spass-v3.2-5-gd38d173_GH0.tar.gz) = 53482