diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 38d85ad00ff6..5f7af735fc7b 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	nbd
-PORTVERSION=	3.24
-PORTREVISION=	1
+DISTVERSION=	3.25
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	https://github.com/NetworkBlockDevice/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	-server
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Server for the Linux network block device (nbd)
-WWW=		http://nbd.sourceforge.net/
+WWW=		https://github.com/NetworkBlockDevice/nbd
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		bison:wrapper cpe gnome pkgconfig
+USES=		bison:wrapper cpe gnome pkgconfig tar:xz
 CPE_VENDOR=	wouter_verhelst
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-lfs --enable-syslog
-TEST_TARGET=	check
 
-OPTIONS_DEFINE=	GNUTLS
-GNUTLS_CONFIGURE_WITH=	gnutls
-GNUTLS_BUILD_DEPENDS=	gnutls>0:security/gnutls
-GNUTLS_RUN_DEPENDS=	gnutls>0:security/gnutls
+TEST_TARGET=	check
 
 PLIST_FILES=	bin/nbd-server bin/nbd-trdump bin/nbd-trplay \
 		share/man/man1/nbd-server.1.gz \
 		share/man/man1/nbd-trdump.1.gz \
 		share/man/man1/nbd-trplay.1.gz \
 		share/man/man5/nbd-server.5.gz \
 		share/man/man5/nbdtab.5.gz \
 		share/man/man8/nbd-client.8.gz
 
+OPTIONS_DEFINE=	GNUTLS
+
+GNUTLS_BUILD_DEPENDS=	gnutls>0:security/gnutls
+GNUTLS_RUN_DEPENDS=	gnutls>0:security/gnutls
+GNUTLS_CONFIGURE_WITH=	gnutls
+
 .include <bsd.port.mk>
diff --git a/net/nbd-server/distinfo b/net/nbd-server/distinfo
index d0dc79260fb8..b9d70da8a302 100644
--- a/net/nbd-server/distinfo
+++ b/net/nbd-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647024854
-SHA256 (nbd-3.24.tar.gz) = a771022599525fd4f5c17c7b1c88696a91927c227e770425a55f67a7384441b6
-SIZE (nbd-3.24.tar.gz) = 1116296
+TIMESTAMP = 1775559444
+SHA256 (nbd-3.25.tar.xz) = f5c8fd0fcb57b1c926594d0e57f356432ee08678bef1d40d088f0830f0cbdd0a
+SIZE (nbd-3.25.tar.xz) = 566360