diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index 8d794306bfa4..01ca333592cf 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -1,47 +1,48 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 
 PORTNAME=	oath-toolkit
 PORTVERSION=	2.6.7
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Library, tools, and PAM module for OATH authentication
 
 LICENSE=	GPLv3+ LGPL20+
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR}
 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/files/patch-pam__oath_Makefile.in b/security/oath-toolkit/files/patch-pam__oath_Makefile.in
index 427bdc6233bb..354c0a7078f9 100644
--- a/security/oath-toolkit/files/patch-pam__oath_Makefile.in
+++ b/security/oath-toolkit/files/patch-pam__oath_Makefile.in
@@ -1,11 +1,58 @@
---- pam_oath/Makefile.in.orig	2022-01-31 11:17:51 UTC
+--- pam_oath/Makefile.in.orig	2022-02-01 11:49:49 UTC
 +++ pam_oath/Makefile.in
-@@ -414,7 +414,7 @@ AM_CPPFLAGS = -I$(builddir)/../liboath
+@@ -149,7 +149,7 @@ am__uninstall_files_from_dir = { \
+ am__installdirs = "$(DESTDIR)$(pammoddir)"
+ LTLIBRARIES = $(pammod_LTLIBRARIES)
+ pam_oath_la_DEPENDENCIES = ../liboath/liboath.la
+-am_pam_oath_la_OBJECTS = pam_oath.lo
++am_pam_oath_la_OBJECTS = pam_oath.lo pam_modutil.lo
+ pam_oath_la_OBJECTS = $(am_pam_oath_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -173,7 +173,8 @@ am__v_at_1 = 
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+ am__maybe_remake_depfiles = depfiles
+-am__depfiles_remade = ./$(DEPDIR)/pam_oath.Plo
++am__depfiles_remade = ./$(DEPDIR)/pam_modutil.Plo \
++	./$(DEPDIR)/pam_oath.Plo
+ am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -414,7 +416,7 @@ AM_CPPFLAGS = -I$(builddir)/../liboath
  EXTRA_DIST = README
  pammoddir = $(PAMDIR)
  pammod_LTLIBRARIES = pam_oath.la
 -pam_oath_la_SOURCES = pam_oath.c
 +pam_oath_la_SOURCES = pam_oath.c pam_modutil.c pam_modutil.h
  # XXX add -Wl,-x too?  PAM documentation suggests it.
  pam_oath_la_LIBADD = ../liboath/liboath.la
  pam_oath_la_LDFLAGS = -module -avoid-version
+@@ -516,6 +518,7 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_modutil.Plo@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_oath.Plo@am__quote@ # am--include-marker
+ 
+ $(am__depfiles_remade):
+@@ -896,7 +904,8 @@ clean-am: clean-generic clean-libtool clean-pammodLTLI
+ 
+ distclean: distclean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+-		-rm -f ./$(DEPDIR)/pam_oath.Plo
++		-rm -f ./$(DEPDIR)/pam_modutil.Plo
++	-rm -f ./$(DEPDIR)/pam_oath.Plo
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-hdr distclean-libtool distclean-tags
+@@ -944,7 +953,8 @@ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ 	-rm -rf $(top_srcdir)/autom4te.cache
+-		-rm -f ./$(DEPDIR)/pam_oath.Plo
++		-rm -f ./$(DEPDIR)/pam_modutil.Plo
++	-rm -f ./$(DEPDIR)/pam_oath.Plo
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+