diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index 6e7185c29f6b..512c32ed764a 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -1,49 +1,48 @@
 PORTNAME=	oath-toolkit
-PORTVERSION=	2.6.9
-PORTREVISION=	2
+PORTVERSION=	2.6.13
 CATEGORIES=	security
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Library, tools, and PAM module for OATH authentication
-WWW=		https://www.nongnu.org/oath-toolkit/
+WWW=		https://oath-toolkit.codeberg.page/
 
 LICENSE=	GPLv3+ LGPL20+
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-pam-tests
 USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	libxslt
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	PSKC DOCS
 OPTIONS_DEFAULT=PSKC
 OPTIONS_SUB=	yes
 
 PSKC_DESC=	Portable Symmetric Key Container (RFC 6030) support
 
 PSKC_CONFIGURE_ENABLE=	pskc
 PSKC_CONFIGURE_ON=	--with-xml-prefix=${LOCALBASE}
 PSKC_LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 			libxmlsec1.so:security/xmlsec1
 
 DOCS=		AUTHORS ChangeLog NEWS README
 
 PORTDOCS=	*
 
 post-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}/
 .endfor
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}/pam_oath
 	${INSTALL_DATA} ${WRKSRC}/pam_oath/README \
 		${STAGEDIR}/${DOCSDIR}/pam_oath/
 
 .include <bsd.port.mk>
diff --git a/security/oath-toolkit/distinfo b/security/oath-toolkit/distinfo
index bd627e1dce41..b7bf58d44c4d 100644
--- a/security/oath-toolkit/distinfo
+++ b/security/oath-toolkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689066348
-SHA256 (oath-toolkit-2.6.9.tar.gz) = 333ac831c8f1a6dbd7feb897339bba453ff34d3b0f4cfaa6b5a20dba55c8e985
-SIZE (oath-toolkit-2.6.9.tar.gz) = 4693524
+TIMESTAMP = 1765190904
+SHA256 (oath-toolkit-2.6.13.tar.gz) = 5b5d82e9a4455206d24fcbd7ee58bf4c79398a2e67997d80bd45ae927586b18b
+SIZE (oath-toolkit-2.6.13.tar.gz) = 3847530
diff --git a/security/oath-toolkit/files/patch-liboath_tests_tst__basic.c b/security/oath-toolkit/files/patch-liboath_tests_tst__basic.c
deleted file mode 100644
index e1583b1c584a..000000000000
--- a/security/oath-toolkit/files/patch-liboath_tests_tst__basic.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- liboath/tests/tst_basic.c.orig	2022-01-31 11:26:43 UTC
-+++ liboath/tests/tst_basic.c
-@@ -57,7 +57,7 @@ main (void)
-       return 1;
-     }
- 
--  if (OATH_VERSION_NUMBER < 0x02060300 || OATH_VERSION_NUMBER >= 0x03000000)
-+  if (OATH_VERSION_NUMBER < 0x02060200 || OATH_VERSION_NUMBER >= 0x03000000)
-     {
-       printf ("OATH_VERSION_NUMBER out of range?!\n");
-       return 1;
diff --git a/security/oath-toolkit/files/patch-liboath_tests_tst__totp__validate.c b/security/oath-toolkit/files/patch-liboath_tests_tst__totp__validate.c
deleted file mode 100644
index 616fcd5ee021..000000000000
--- a/security/oath-toolkit/files/patch-liboath_tests_tst__totp__validate.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- liboath/tests/tst_totp_validate.c.orig	2022-01-31 11:03:27 UTC
-+++ liboath/tests/tst_totp_validate.c
-@@ -156,7 +156,7 @@ main (void)
- 	}
-       if (otp_counter != tv[i].otp_counter)
- 	{
--	  printf ("validate3 loop %ld failed (counter %d != %d)?!\n",
-+	  printf ("validate3 loop %ld failed (counter %ld != %ld)?!\n",
- 		  i, otp_counter, tv[i].otp_counter);
- 	  return 1;
- 	}
-@@ -184,7 +184,7 @@ main (void)
- 	}
-       if (otp_counter != tv[i].otp_counter)
- 	{
--	  printf ("validate3_callback loop %ld failed (counter %d != %d)?!\n",
-+	  printf ("validate3_callback loop %ld failed (counter %ld != %ld)?!\n",
- 		  i, otp_counter, tv[i].otp_counter);
- 	  return 1;
- 	}
diff --git a/security/oath-toolkit/files/patch-libpskc_tests_tst__basic.c b/security/oath-toolkit/files/patch-libpskc_tests_tst__basic.c
deleted file mode 100644
index e69b5c0425d7..000000000000
--- a/security/oath-toolkit/files/patch-libpskc_tests_tst__basic.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpskc/tests/tst_basic.c.orig	2022-01-31 11:38:13 UTC
-+++ libpskc/tests/tst_basic.c
-@@ -70,7 +70,7 @@ main (void)
-       return 1;
-     }
- 
--  if (PSKC_VERSION_NUMBER < 0x02060300 || PSKC_VERSION_NUMBER >= 0x03000000)
-+  if (PSKC_VERSION_NUMBER < 0x02060200 || PSKC_VERSION_NUMBER >= 0x03000000)
-     {
-       printf ("PSKC_VERSION_NUMBER out of range?!\n");
-       return 1;