diff --git a/net/freediameter/Makefile b/net/freediameter/Makefile
index 1dc3027986b7..b3a82e6e7f39 100644
--- a/net/freediameter/Makefile
+++ b/net/freediameter/Makefile
@@ -1,25 +1,27 @@
 PORTNAME=	freediameter
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.freediameter.net/hg/freeDiameter/archive/
-DISTNAME=	${PORTNAME:S/d/D/}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source Diameter protocol implementation
-WWW=		http://www.freediameter.net/
+WWW=		https://github.com/freeDiameter/freeDiameter/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
-		libidn.so:dns/libidn
+		libidn2.so:dns/libidn2
+
+USES=		bison cmake:testing cpe pkgconfig tar:bzip2
 
-USES=		bison cmake cpe tar:bzip2
 USE_LDCONFIG=	yes
-CMAKE_ARGS=	-DSCTP_USE_MAPPED_ADDRESSES:BOOL=ON
-CMAKE_ARGS+=	-DDISABLE_SCTP:BOOL=ON
-TEST_TARGET=	test
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	freeDiameter
+GH_PROJECT=	freeDiameter
+
+CMAKE_ON=	SCTP_USE_MAPPED_ADDRESSES \
+		DISABLE_SCTP
 
 .include <bsd.port.mk>
diff --git a/net/freediameter/distinfo b/net/freediameter/distinfo
index 2b01ca59445d..1016214baef7 100644
--- a/net/freediameter/distinfo
+++ b/net/freediameter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602305907
-SHA256 (freeDiameter-1.5.0.tar.bz2) = f1e5ad75e09759ad0e5ba6aee2bf26a354c60d136a6ea4a2129b47041f6fa336
-SIZE (freeDiameter-1.5.0.tar.bz2) = 793312
+TIMESTAMP = 1788515058
+SHA256 (freeDiameter-freeDiameter-1.6.0_GH0.tar.gz) = 0bb4ed33ada0b57ab681d86ae3fe0e3a9ce95892f492c401cbb68a87ec1d47bc
+SIZE (freeDiameter-freeDiameter-1.6.0_GH0.tar.gz) = 1033949
diff --git a/net/freediameter/pkg-plist b/net/freediameter/pkg-plist
index 38d7572c2cd1..c87a2c4be1ad 100644
--- a/net/freediameter/pkg-plist
+++ b/net/freediameter/pkg-plist
@@ -1,39 +1,39 @@
 bin/freeDiameterd
-bin/freeDiameterd-1.5.0
+bin/freeDiameterd-1.6.0
 include/freeDiameter/extension.h
 include/freeDiameter/freeDiameter-host.h
 include/freeDiameter/libfdcore.h
 include/freeDiameter/libfdproto.h
 lib/freeDiameter/acl_wl.fdx
 lib/freeDiameter/dbg_dict_dump.fdx
 lib/freeDiameter/dbg_loglevel.fdx
 lib/freeDiameter/dbg_monitor.fdx
 lib/freeDiameter/dbg_msg_dumps.fdx
 lib/freeDiameter/dbg_msg_timings.fdx
 lib/freeDiameter/dbg_rt.fdx
 lib/freeDiameter/dict_dcca.fdx
 lib/freeDiameter/dict_dcca_3gpp.fdx
 lib/freeDiameter/dict_dcca_starent.fdx
 lib/freeDiameter/dict_eap.fdx
 lib/freeDiameter/dict_mip6a.fdx
 lib/freeDiameter/dict_mip6i.fdx
 lib/freeDiameter/dict_nas_mipv6.fdx
 lib/freeDiameter/dict_nasreq.fdx
 lib/freeDiameter/dict_rfc5777.fdx
 lib/freeDiameter/dict_sip.fdx
 lib/freeDiameter/rt_busypeers.fdx
 lib/freeDiameter/rt_default.fdx
 lib/freeDiameter/rt_deny_by_size.fdx
 lib/freeDiameter/rt_ignore_dh.fdx
 lib/freeDiameter/rt_load_balance.fdx
 lib/freeDiameter/rt_randomize.fdx
 lib/freeDiameter/rt_redirect.fdx
 lib/freeDiameter/rt_rewrite.fdx
 lib/freeDiameter/test_cc.fdx
 lib/freeDiameter/test_ccload.fdx
 lib/libfdcore.so
-lib/libfdcore.so.1.5.0
-lib/libfdcore.so.6
+lib/libfdcore.so.1.6.0
+lib/libfdcore.so.7
 lib/libfdproto.so
-lib/libfdproto.so.1.5.0
-lib/libfdproto.so.6
+lib/libfdproto.so.1.6.0
+lib/libfdproto.so.7