diff --git a/benchmarks/iperf3/Makefile b/benchmarks/iperf3/Makefile
index dd4294504da3..adf55ff2a8f4 100644
--- a/benchmarks/iperf3/Makefile
+++ b/benchmarks/iperf3/Makefile
@@ -1,42 +1,40 @@
 PORTNAME=	iperf
-DISTVERSION=	3.16
-PORTREVISION=	1
+DISTVERSION=	3.17.1
 CATEGORIES=	benchmarks
-MASTER_SITES=	https://downloads.es.net/pub/iperf/
+MASTER_SITES=	https://github.com/esnet/${PORTNAME}/releases/download/${DISTVERSION}/ \
+		https://downloads.es.net/pub/${PORTNAME}/
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	bmah@FreeBSD.org
 COMMENT=	Improved tool to measure TCP and UDP bandwidth
 WWW=		https://software.es.net/iperf/
 
 LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
 USES=		cpe libtool ssl
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-USE_LDCONFIG=	yes
-
 CPE_VENDOR=	iperf_project
+USE_LDCONFIG=	yes
 
+GNU_CONFIGURE=	yes
 PORTDOCS=	README.md RELNOTES.md
 
-# Set ${DOCSDIR} to avoid conflict with benchmarks/iperf ${DOCSDIR}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+# Set ${DOCSDIR} to avoid conflict with benchmarks/iperf
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS STATIC
 OPTIONS_SUB=	yes
 
 STATIC_CONFIGURE_ENABLE=	static
 
 post-patch:
 # Don't build stuff that we're not going to install.  Among other
 # things this means we're not going to try to build profiled objects
 # and/or executables.
 	@${REINPLACE_CMD} -e '/^PROGRAMS /s/\$$(noinst_PROGRAMS)//' ${WRKSRC}/src/Makefile.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/benchmarks/iperf3/distinfo b/benchmarks/iperf3/distinfo
index 557e6b5adccf..4bf7c130c6e3 100644
--- a/benchmarks/iperf3/distinfo
+++ b/benchmarks/iperf3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701467248
-SHA256 (iperf-3.16.tar.gz) = cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e
-SIZE (iperf-3.16.tar.gz) = 664751
+TIMESTAMP = 1715628449
+SHA256 (iperf-3.17.1.tar.gz) = 84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa
+SIZE (iperf-3.17.1.tar.gz) = 670547