diff --git a/net/freediameter/Makefile b/net/freediameter/Makefile
index 7095f244690f..c9d1e650dc18 100644
--- a/net/freediameter/Makefile
+++ b/net/freediameter/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	freeDiameter
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTNAME=	freediameter
+PORTVERSION=	1.5.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
@@ -16,8 +16,10 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
 		libidn.so:dns/libidn
 
-USES=		cmake bison
+USES=		bison cmake tar:bzip2
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DSCTP_USE_MAPPED_ADDRESSES:BOOL=ON
+CMAKE_ARGS+=	-DDISABLE_SCTP:BOOL=ON
+TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/net/freediameter/distinfo b/net/freediameter/distinfo
index eb42287218a8..2b01ca59445d 100644
--- a/net/freediameter/distinfo
+++ b/net/freediameter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (freeDiameter-1.2.0.tar.gz) = 0601a7f559af6596dff8e18f5c9b17bc66de50d8e05640aa64a3403a841cb228
-SIZE (freeDiameter-1.2.0.tar.gz) = 855257
+TIMESTAMP = 1602305907
+SHA256 (freeDiameter-1.5.0.tar.bz2) = f1e5ad75e09759ad0e5ba6aee2bf26a354c60d136a6ea4a2129b47041f6fa336
+SIZE (freeDiameter-1.5.0.tar.bz2) = 793312
diff --git a/net/freediameter/files/patch-include_freeDiameter_libfdproto.h b/net/freediameter/files/patch-include_freeDiameter_libfdproto.h
new file mode 100644
index 000000000000..36099cf50d51
--- /dev/null
+++ b/net/freediameter/files/patch-include_freeDiameter_libfdproto.h
@@ -0,0 +1,18 @@
+--- include/freeDiameter/libfdproto.h.orig	2020-10-10 04:58:27 UTC
++++ include/freeDiameter/libfdproto.h
+@@ -292,8 +292,13 @@ extern int fd_g_debug_lvl;
+ 
+ /* A version of __FILE__ without the full path. This is specific to each C file being compiled */
+ static char * file_bname = NULL;
+-static char * file_bname_init(char * full) { file_bname = basename(full); return file_bname; }
+-#define __STRIPPED_FILE__	(file_bname ?: file_bname_init((char *)__FILE__))
++static char * file_bname_init(const char * full) {
++	/* Since FreeBSD 12.0, basename() modifies the provided
++	 * input buffer, so we must strdup() the input string,
++	 * otherwise we'd segfault on __FILE__ which is const. */
++	file_bname = basename(strdup(full));
++	return file_bname; }
++#define __STRIPPED_FILE__	(file_bname ?: file_bname_init(__FILE__))
+ 
+ 
+ 
diff --git a/net/freediameter/files/patch-libfdcore_sctp.c b/net/freediameter/files/patch-libfdcore_sctp.c
deleted file mode 100644
index e1ec18bff294..000000000000
--- a/net/freediameter/files/patch-libfdcore_sctp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libfdcore/sctp.c.orig	2013-09-14 10:09:01 UTC
-+++ libfdcore/sctp.c
-@@ -575,7 +575,7 @@ static int fd_setsockopt_prebind(int sk)
- 		
- 		struct sctp_event event;
- 		
--		for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0]) - 1; i++) {
-+		for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0]) - 1); i++) {
- 			memset(&event, 0, sizeof(event));
- 			event.se_type = events_I_want[i];
- 			event.se_on = 1;
diff --git a/net/freediameter/pkg-plist b/net/freediameter/pkg-plist
index 94f4a0eb4aec..38d7572c2cd1 100644
--- a/net/freediameter/pkg-plist
+++ b/net/freediameter/pkg-plist
@@ -1,32 +1,39 @@
 bin/freeDiameterd
-bin/freeDiameterd-1.2.0
-include/freeDiameter/freeDiameter-host.h
-include/freeDiameter/libfdproto.h
-include/freeDiameter/libfdcore.h
+bin/freeDiameterd-1.5.0
 include/freeDiameter/extension.h
-lib/libfdproto.so
-lib/libfdproto.so.6
-lib/libfdproto.so.1.2.0
-lib/libfdcore.so
-lib/libfdcore.so.6
-lib/libfdcore.so.1.2.0
-lib/freeDiameter/dict_nasreq.fdx
-lib/freeDiameter/dict_eap.fdx
+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_sip.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/rt_default.fdx
-lib/freeDiameter/rt_redirect.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/acl_wl.fdx
-lib/freeDiameter/dbg_monitor.fdx
-lib/freeDiameter/dbg_msg_timings.fdx
-lib/freeDiameter/dbg_rt.fdx
-lib/freeDiameter/dbg_msg_dumps.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/libfdproto.so
+lib/libfdproto.so.1.5.0
+lib/libfdproto.so.6