diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 2a14f46559de..a05f153e473f 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	am-utils
 PORTVERSION=	6.2
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	https://download.filesystems.org/am-utils/ \
 		ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Berkeley Automounter Suite of Utilities
 WWW=		https://www.am-utils.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	OPENLDAP DOCS
 OPTIONS_DEFAULT=OPENLDAP
 OPENLDAP_DESC=	OpenLDAP support
 
 USES=		autoreconf:build bison libtool makeinfo perl5
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
 CONFIGURE_ARGS=	--enable-shared
 # Enable some filesystems which are not auto-detected with GENERIC kernel.
 CONFIGURE_ARGS+=	ac_cv_fs_mfs=yes ac_cv_mnttab_type_nullfs='"mfs"' ac_cv_mount_type_nullfs='"mfs"' \
 			ac_cv_fs_nullfs=yes ac_cv_mnttab_type_nullfs='"nullfs"' ac_cv_mount_type_nullfs='"nullfs"' \
 			ac_cv_fs_udf=yes ac_cv_mnttab_type_udf='"udf"' ac_cv_mount_type_udf='"udf"' \
 			ac_cv_fs_tmpfs=yes ac_cv_mnttab_type_tmpfs='"tmpfs"' ac_cv_mount_type_tmpfs='"tmpfs"'
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 INSTALL_TARGET=	install-strip
 
 INFO=		am-utils
 PORTDOCS=	AUTHORS BUGS FAQ NEWS README.attrcache
 
 OPENLDAP_USES=			ldap localbase:ldflags
 OPENLDAP_CONFIGURE_WITH=	ldap
 OPENLDAP_PORTDOCS=		README.ldap ldap-id.txt ldap.schema
 
 OPTIONS_SUB=	yes
 
 .if !exists(/etc/rc.d/amd)
 USE_RC_SUBR=	amd
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/am-utils.info*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/am-utils/files/patch-amq_amq.c b/sysutils/am-utils/files/patch-amq_amq.c
new file mode 100644
index 000000000000..3e13cd1e645e
--- /dev/null
+++ b/sysutils/am-utils/files/patch-amq_amq.c
@@ -0,0 +1,12 @@
+diff --git amq/amq.c.orig amq/amq.c
+--- amq/amq.c.orig
++++ amq/amq.c
+@@ -79,7 +79,7 @@ enum show_opt {
+ static void
+ time_print(time_type tt)
+ {
+-  time_t t = (time_t)tt;
++  time_t t = (time_t)(intptr_t)tt;
+   struct tm *tp = localtime(&t);
+   printf("%02d/%02d/%04d %02d:%02d:%02d",
+ 	 tp->tm_mon + 1, tp->tm_mday,