diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 8894154a704c..7bce4db5dfa5 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,71 +1,74 @@
 # Created by: R.I.Pienaar <rip@devco.net>
 
 PORTNAME=	msmtp
-PORTVERSION=	1.8.16
+PORTVERSION=	1.8.17
 CATEGORIES=	mail
 MASTER_SITES=	https://marlam.de/msmtp/releases/
 
+PATCH_SITES=	https://github.com/marlam/msmtp-mirror/commit/
+PATCHFILES=	7f03f3767ee6b7311621386c77cb5575fcaa13d0.patch:-p1
+
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	SMTP plugin for MUAs
 
 LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo pkgconfig tar:xz
+USES=		autoreconf cpe gmake makeinfo pkgconfig tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INFO=		msmtp
 CPE_VENDOR=	marlam
 
 OPTIONS_DEFINE=	DOCS GSASL NLS IDN LIBSECRET MSMTPD MSMTPQ
 OPTIONS_RADIO=	TLS
 OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	GNUTLS MSMTPD MSMTPQ
 OPTIONS_SUB=	yes
 
 GSASL_DESC=	GSASL support
 LIBSECRET_DESC=	GNOME password management
 MSMTPD_DESC=	Include minimal SMTP server that pipes mails to msmtp
 MSMTPQ_DESC=	Install offline messaging scripts
 
 GSASL_CONFIGURE_WITH=	libgsasl
 GSASL_LIB_DEPENDS=	libgsasl.so:security/libgsasl
 IDN_CONFIGURE_WITH=	libidn
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 LIBSECRET_CONFIGURE_WITH=	libsecret
 LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 MSMTPD_CONFIGURE_WITH=	msmtpd
 MSMTPQ_PORTDOCS=	README.msmtpq
 MSMTPQ_RUN_DEPENDS=	bash:shells/bash
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 GNUTLS_CONFIGURE_ON=	--with-tls=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-tls=openssl
 OPENSSL_CONFIGURE_ENV=	libssl_CFLAGS="-I${OPENSSLINC}" \
 			libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 CERTSFILE=		${LOCALBASE}/share/certs/ca-root-nss.crt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL}
 RUN_DEPENDS+=	${CERTSFILE}:security/ca_root_nss
 .else
 CONFIGURE_ARGS+=	--with-tls=no
 .endif
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${CERTSFILE}|' \
 		${WRKSRC}/doc/msmtp.1
 
 .if ${PORT_OPTIONS:MMSMTPQ}
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtp-queue ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtpq ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index d3cb0ac6da59..d90641fc5a5a 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1631865713
-SHA256 (msmtp-1.8.16.tar.xz) = c04b5d89f3df0dee9772f50197c2602c97c5cdb439b6af539c37bf81b20f47d8
-SIZE (msmtp-1.8.16.tar.xz) = 375372
+TIMESTAMP = 1634346538
+SHA256 (msmtp-1.8.17.tar.xz) = 0fddbe74c1a9dcf6461b4a1b0db3e4d34266184500c403d7f107ad42db4ec4d3
+SIZE (msmtp-1.8.17.tar.xz) = 379876
+SHA256 (7f03f3767ee6b7311621386c77cb5575fcaa13d0.patch) = 38ea655fee0b24d7ff964062541c70c3f9795f75c415c14212ec3185c6646aa3
+SIZE (7f03f3767ee6b7311621386c77cb5575fcaa13d0.patch) = 761