diff --git a/security/stoken/Makefile b/security/stoken/Makefile
index 5bdf6e775e5e..5d9685590f3a 100644
--- a/security/stoken/Makefile
+++ b/security/stoken/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	stoken
-DISTVERSION=	0.92
-PORTREVISION=	2
+DISTVERSION=	0.93
 CATEGORIES=	security
-MASTER_SITES=	SF/stoken
 
 MAINTAINER=	samm@FreeBSD.org
 COMMENT=	Software Token for UNIX compatible with RSA SecurID
 WWW=		https://sourceforge.net/p/stoken/wiki/Home/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libtomcrypt.so:security/libtomcrypt # can alternatively use nettle, potentially port option can be created
 
-USES=		gnome libtool localbase pkgconfig
+USES=		gnome libtool localbase pkgconfig autoreconf
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_TAGNAME=	v${DISTVERSION}
+GH_ACCOUNT=	stoken-dev
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_SUB=	yes
 
 X11_CONFIGURE_WITH=	gtk
 X11_DESC=	Build GUI token interface
 X11_USE=	GNOME=gtk30,cairo,gdkpixbuf2
+X11_USES=	desktop-file-utils
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g ; s|^dist_doc_DATA|#dist_doc_DATA|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|LTC_LTC_PKCS_1_V1_5|LTC_PKCS_1_V1_5|g' \
-	    ${WRKSRC}/src/stc-tomcrypt.c
+do-test: build
+	cd ${WRKSRC} && ${MAKE} check
 
 .include <bsd.port.mk>
diff --git a/security/stoken/distinfo b/security/stoken/distinfo
index 4ce82c190f3b..83b11e15f43f 100644
--- a/security/stoken/distinfo
+++ b/security/stoken/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518349781
-SHA256 (stoken-0.92.tar.gz) = aa2b481b058e4caf068f7e747a2dcf5772bcbf278a4f89bc9efcbf82bcc9ef5a
-SIZE (stoken-0.92.tar.gz) = 425835
+TIMESTAMP = 1689077674
+SHA256 (stoken-dev-stoken-0.93-v0.93_GH0.tar.gz) = 102e2d112b275efcdc20ef438670e4f24f08870b9072a81fda316efcc38aef9c
+SIZE (stoken-dev-stoken-0.93-v0.93_GH0.tar.gz) = 118216
diff --git a/security/stoken/pkg-plist b/security/stoken/pkg-plist
index ac3fdb5e837d..2d82cf04b878 100644
--- a/security/stoken/pkg-plist
+++ b/security/stoken/pkg-plist
@@ -1,17 +1,20 @@
 bin/stoken
 %%X11%%bin/stoken-gui
 include/stoken.h
 lib/libstoken.a
 lib/libstoken.so
 lib/libstoken.so.1
 lib/libstoken.so.1.3.0
 %%X11%%man/man1/stoken-gui.1.gz
 man/man1/stoken.1.gz
 %%X11%%share/applications/stoken-gui-small.desktop
 %%X11%%share/applications/stoken-gui.desktop
 %%X11%%%%DATADIR%%/password-dialog.ui
 %%X11%%%%DATADIR%%/pin-dialog.ui
 %%X11%%%%DATADIR%%/tokencode-detail.ui
 %%X11%%%%DATADIR%%/tokencode-small.ui
 %%X11%%share/pixmaps/stoken-gui.png
 libdata/pkgconfig/stoken.pc
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/libstoken-test.c
+%%PORTDOCS%%%%DOCSDIR%%/sdtid-test.pl