diff --git a/sysutils/pwsafe/Makefile b/sysutils/pwsafe/Makefile
index d84c11a9e963..f070fda154f4 100644
--- a/sysutils/pwsafe/Makefile
+++ b/sysutils/pwsafe/Makefile
@@ -1,37 +1,44 @@
 # Created by: Daniel Johansson <donnex@donnex.net>
 
 PORTNAME=	pwsafe
-DISTVERSION=	0.2.0-155
-DISTVERSIONSUFFIX=	-g1dbcfd0
+DISTVERSION=	0.2.2beta-196
+DISTVERSIONSUFFIX=	-g4bf61c5
 CATEGORIES=	sysutils
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Command-line encrypted password database manager
 
 LICENSE=	GPLv2+
 
+FLAVORS=		x11 nox11
+FLAVOR?=		${FLAVORS:[1]}
+nox11_PKGNAMESUFFIX=	-nox11
+
 USES=		autoreconf gmake ncurses readline ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_curses_h=yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	nsd20463
-GH_TAGNAME=	1dbcfd0
+GH_TAGNAME=	4bf61c5
 
 PLIST_FILES=	bin/pwsafe \
 		man/man1/pwsafe.1.gz
 
-OPTIONS_DEFINE=	SETUID X11
+OPTIONS_DEFINE=	SETUID
 SETUID_DESC=	Install setuid pwsafe binary
 
-X11_USES=	xorg
-X11_USE=	XORG=ice,sm,x11,xmu
-X11_CONFIGURE_OFF=	--without-x
+.if ${FLAVOR} == "x11"
+USES+=			xorg
+USE_XORG=		ice sm x11 xmu
+.elif ${FLAVOR} == "nox11"
+CONFIGURE_ARGS+=	--without-x
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pwsafe ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pwsafe.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 post-install-SETUID-on:
 	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/pwsafe
 
 .include <bsd.port.mk>
diff --git a/sysutils/pwsafe/distinfo b/sysutils/pwsafe/distinfo
index 64de6fa5ddb0..abc7f106fb7a 100644
--- a/sysutils/pwsafe/distinfo
+++ b/sysutils/pwsafe/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573436205
-SHA256 (nsd20463-pwsafe-0.2.0-155-g1dbcfd0-1dbcfd0_GH0.tar.gz) = 0de804f06b76ae985fd414395855e57cc60e890ca1c80dd1e93f6b4b6225cf2f
-SIZE (nsd20463-pwsafe-0.2.0-155-g1dbcfd0-1dbcfd0_GH0.tar.gz) = 80158
+TIMESTAMP = 1644006261
+SHA256 (nsd20463-pwsafe-0.2.2beta-196-g4bf61c5-4bf61c5_GH0.tar.gz) = 08d8886c700b2a4bbb243f7b20e8ff500d1f1dc334ac7a86641138bd4e8cde9e
+SIZE (nsd20463-pwsafe-0.2.2beta-196-g4bf61c5-4bf61c5_GH0.tar.gz) = 49943
diff --git a/sysutils/pwsafe/pkg-descr b/sysutils/pwsafe/pkg-descr
index d75db21c3b47..a54ccd46f1ab 100644
--- a/sysutils/pwsafe/pkg-descr
+++ b/sysutils/pwsafe/pkg-descr
@@ -1,9 +1,9 @@
 Pwsafe is a Unix commandline program that manages encrypted password databases.
 
 * Pure command-line operation if desired (good for remote access over ssh)
 * Can interact with X11 selection & clipboard.
 * Portable, endianess-clean, misaligned-access-free C++. Compiles cleanly
   on Linux, *BSD, OS X, Solaris.
 * Compatible with CounterPane's PasswordSafe Win32 program versions 1.9.x.
 
-WWW: http://nsd.dyndns.org/pwsafe/
+WWW: https://github.com/nsd20463/pwsafe/