diff --git a/sysutils/pwsafe/Makefile b/sysutils/pwsafe/Makefile
index 674f24fe765f..2c68a01e3e40 100644
--- a/sysutils/pwsafe/Makefile
+++ b/sysutils/pwsafe/Makefile
@@ -2,26 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	pwsafe
-PORTVERSION=	0.2.0
-PORTREVISION=	4
+DISTVERSION=	0.2.0-155
+DISTVERSIONSUFFIX=	-g1dbcfd0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://nsd.dyndns.org/pwsafe/releases/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Cmdline program that manages encrypted password databases
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	SETUID X11
-SETUID_DESC=	Install setuid pwsafe binary
+USES=		autoreconf gmake ncurses readline ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	nsd20463
+GH_PROJECT=	pwsafe
+GH_TAGNAME=	1dbcfd0
 
-USES=		gmake ncurses readline ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_header_curses_h=yes
 
-PLIST_FILES=	bin/pwsafe man/man1/pwsafe.1.gz
+PLIST_FILES=	bin/pwsafe \
+		man/man1/pwsafe.1.gz
+
+OPTIONS_DEFINE=	SETUID X11
+
+SETUID_DESC=	Install setuid pwsafe binary
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/pwsafe/distinfo b/sysutils/pwsafe/distinfo
index a4031d1aaed3..64de6fa5ddb0 100644
--- a/sysutils/pwsafe/distinfo
+++ b/sysutils/pwsafe/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pwsafe-0.2.0.tar.gz) = 61e91dc5114fe014a49afabd574eda5ff49b36c81a6d492c03fcb10ba6af47b7
-SIZE (pwsafe-0.2.0.tar.gz) = 127433
+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
diff --git a/sysutils/pwsafe/files/patch-pwsafe.cpp b/sysutils/pwsafe/files/patch-pwsafe.cpp
index 6fd4bcb765a4..b304d687c141 100644
--- a/sysutils/pwsafe/files/patch-pwsafe.cpp
+++ b/sysutils/pwsafe/files/patch-pwsafe.cpp
@@ -14,12 +14,3 @@
          if (rc) {
            if (arg_verbose > 0) printf("rng seeded with %d bytes from %s\n", rc, rng_filename);
          } else {
-@@ -2111,7 +2116,7 @@ static secstring xmlescape(const secstri
-       case '"': out += "&quot;"; break;
-       case '&': out += "&amp;"; break;
-       case '<': out += "&lt;"; break;
--      case '>': out += "&gt"; break;
-+      case '>': out += "&gt;"; break;
-       case '\\': out += "\\\\"; break;
-       default: out += c;
-     }