diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 02c2567c99c4..42c77e26d64d 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,116 +1,115 @@
 PORTNAME?=	fetchmail
-DISTVERSION=	6.6.3
+DISTVERSION=	6.6.4
 PORTREVISION?=	0
 CATEGORIES=	mail
 # The next line is inherited by the fetchmailconf dependent port,
 # do NOT replace fetchmail by ${PORTNAME}
 MASTER_SITES=	SF/fetchmail/branch_6.6/
 
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT?=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
 WWW=		https://www.fetchmail.info/
 
 LICENSE=	GPLv2+
 
 .if empty(MASTERDIR)
 USES=		cpe gmake localbase:ldflags pkgconfig tar:xz
 IGNORE_SSL=	libressl libressl-devel
 IGNORE_SSL_REASON=	incompatible license/no GPLv2 clause 2b exception for LibreSSL
 # The Free Software Foundation asserts that a GPL v2 clause 2b exception is
 # required even for dynamically linked binaries. See
 # https://www.gnu.org/licenses/gpl-faq.en.html#GPLStaticVsDynamic
 
 USE_RC_SUBR=	fetchmail
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 # the added PYTHON=: suppresses python builds,
 # see ../../mail/fetchmailconf/ for the configuration tool
 CONFIGURE_ARGS=	--enable-SDPS \
 		--without-hesiod \
 		PYTHON=:
 
 # -Wl,--as-needed suppresses unneeded library references,
 # for instance, libcom_err.so on GSSAPI_NONE builds:
 LDFLAGS+=	-Wl,--as-needed
 
 SUB_FILES=	pkg-message
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 PORTDOCS=	FAQ FEATURES NEWS NOTES OLDNEWS README README.SSL \
 		README.SSL-SERVER design-notes.html esrs-design-notes.html \
 		fetchmail-FAQ.html fetchmail-features.html todo.html
 
 OPTIONS_DEFINE=		OPIE RPA DOCS NLS
 OPTIONS_DEFAULT=	GSSAPI_BASE OPENSSL RPA
 OPTIONS_SINGLE=		GSSAPI TLS
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_TLS=	OPENSSL WOLFSSL
 
 OPTIONS_SUB=	yes
 
 OPIE_DESC=			Build with OPIE support (deprecated - weak/broken cryptography)
 
 RPA_DESC=			Build with RPA support (deprecated - weak/broken cryptography)
 
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
 				--with-gssapi=${GSSAPIBASEDIR}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 GSSAPI_HEIMDAL_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
 				--with-gssapi=${GSSAPIBASEDIR}
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
 				--with-kerberos5=${GSSAPIBASEDIR}
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
 
 OPIE_CONFIGURE_ON=		--enable-opie
 
 RPA_CONFIGURE_ON=		--enable-RPA
 
 WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
 WOLFSSL_USES_OFF=	ssl
 WOLFSSL_CONFIGURE_ON=	WOLFSSL_TRUST_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
 WOLFSSL_CONFIGURE_WITH=	wolfssl=${LOCALBASE}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,krb5_des_string_to_key,krb5int_des_init_state,g' ${WRKSRC}/configure
 .if !exists(/usr/lib/libcom_err.so)
 	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
 .endif
 
 .endif
 
 .if empty(MASTERDIR)
 post-build:
 	${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; }
 
 post-install:
 	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail
 	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \
 		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
 	${RM} ${STAGEDIR}${PREFIX}/bin/fetchmailconf
 	${RM} ${STAGEDIR}${PREFIX}/share/man/man1/fetchmailconf.1*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPIE} && ${MASTERDIR} == ${.CURDIR} && ${OPSYS} == FreeBSD
 . if ${OSVERSION} >= 1400072
 LIB_DEPENDS+=	libopie.so:security/opie	# moved to port (from base in 13.X)
 . endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 8dfc3e136f85..3e4ab69328e2 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1775325323
-SHA256 (fetchmail-6.6.3.tar.xz) = 246e5fc0e35c93dde1a3fb66778e3ab700e16809232e4959c508b91214374bb2
-SIZE (fetchmail-6.6.3.tar.xz) = 1089556
+TIMESTAMP = 1778431676
+SHA256 (fetchmail-6.6.4.tar.xz) = efe01690d22bda359a579c77e2b0072658a092bff490ec0478a212c6b7d0eb70
+SIZE (fetchmail-6.6.4.tar.xz) = 1084660
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index 3ed6267b7973..f04ab28ae398 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -1,47 +1,46 @@
 PORTNAME=	fetchmailconf
 PORTREVISION=	0
 DISTNAME=	fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 # NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable,
 # else _this_ port (fetchmailconf) becomes unfetchable
 
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Python-based GUI to configure fetchmail
 
 LICENSE=	GPLv2+
 
 # minimum required version 6.4.2 - not codified, on the assumption
 # that fetchmail port updated at the same time
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
 		fetchmail>=${PORTVERSION}:mail/fetchmail
 BUILD_DEPENDS+=	${RUN_DEPENDS}
 
 USES=		python shebangfix tar:xz
 USE_PYTHON=	py3kplist
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	PKG_CONFIG=:
 ALL_TARGET=	fetchmailconf
 INSTALL_TARGET=	install-data-am install-nodist_binSCRIPTS install-man
 
 FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${FILESDIR}
 NO_ARCH=	yes
 
 SUB_FILES=	fetchmailconf
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 PLIST=		${.CURDIR}/pkg-plist
 
 post-install:
 # first, run smoke tests - the version check makes sure we have all
 # modules listed in the *_DEPENDS variables:
 		${PYTHON_CMD} ${WRKSRC}/fetchmailconf.py -V
 # then install:
 		${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
 		${RM} ${STAGEDIR}${PREFIX}/share/man/man1/fetchmail.1*
 
 MASTERDIR=	${.CURDIR}/../fetchmail
 
 .include "${MASTERDIR}/Makefile"