diff --git a/net/opensips31/Makefile b/net/opensips31/Makefile
index c67a2bfa1a2e..d1d8d126d83d 100644
--- a/net/opensips31/Makefile
+++ b/net/opensips31/Makefile
@@ -1,113 +1,112 @@
 PORTNAME=	opensips31
-DISTVERSION=	3.1.2
-PORTREVISION=	1
+DISTVERSION=	3.1.6
 CATEGORIES=	net
 MASTER_SITES=	https://opensips.org/pub/opensips/${DISTVERSION}/
 DISTNAME=	opensips-${DISTVERSION}
 
 MAINTAINER=	bambyster@gmail.com
 COMMENT=	Open SIP Server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gm4:devel/m4
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libjson-c.so:devel/json-c \
 		libjwt.so:www/libjwt \
 		libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		gettext-runtime gmake gnome localbase:ldflags ncurses perl5 \
 		pkgconfig shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_GLOB=	*.pl *.sh
 
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		opensips
 GROUPS=		opensips
 
 CFLAGS+=	-pthread
 CXXFLAGS+=	-pthread
 LDFLAGS+=	-pthread
 
 MAKE_ENV+=	BASEDIR=${STAGEDIR} \
 		INSTALL_BIN="${INSTALL_PROGRAM}" \
 		INSTALL_CFG="${INSTALL_DATA}" \
 		INSTALL_DOC="${INSTALL_DATA}" \
 		INSTALL_MODULES="${INSTALL_PROGRAM}" \
 		JSON_BUILDER="pkgconf json-c" \
 		NICER=0
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES HTTP LDAP MEMCACHED MYSQL PGSQL \
 			PYTHON RABBITMQ RADIUS REDIS SQLITE TESTS TLS UNIXODBC
 OPTIONS_DEFAULT=	HTTP LDAP MEMCACHED PGSQL PYTHON RABBITMQ RADIUS REDIS TLS
 OPTIONS_SUB=		yes
 
 HTTP_DESC=		Enable HTTP transport via libmicrohttpd
 MEMCACHED_DESC=		Build with memcached support
 RABBITMQ_DESC=		RabbitMQ/AMQP support
 TESTS_DESC=		Install smoke tests
 
 HTTP_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 HTTP_VARS=		EXTRA_MODULES+=httpd
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_VARS=		EXTRA_MODULES+="ldap h350"
 
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 MEMCACHED_VARS=		EXTRA_MODULES+=cachedb_memcached
 
 MYSQL_USES=		mysql:client
 MYSQL_VARS=		EXTRA_MODULES+=db_mysql
 
 PGSQL_BUILD_DEPENDS=	p5-DBD-Pg>=3.4:databases/p5-DBD-Pg
 PGSQL_USES=		pgsql
 WANT_PGSQL=		client
 PGSQL_VARS=		EXTRA_MODULES+=db_postgres
 
 PYTHON_USES=		python
 PYTHON_MAKE_ENV=	PYTHON=${PYTHON_CMD}
 PYTHON_VARS=		EXTRA_MODULES+=python
 
 RABBITMQ_LIB_DEPENDS=	librabbitmq.so:net/rabbitmq-c-devel
 RABBITMQ_VARS=		EXTRA_MODULES+="event_rabbitmq rabbitmq rabbitmq_consumer"
 
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 RADIUS_VARS=		EXTRA_MODULES+=aaa_radius
 
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 REDIS_VARS=		EXTRA_MODULES+=cachedb_redis
 
 SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 SQLITE_VARS=		EXTRA_MODULES+=db_sqlite
 
 TLS_VARS=		EXTRA_MODULES+="proto_tls proto_wss tls_mgm"
 
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_VARS=		EXTRA_MODULES+=db_unixodbc
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@(${CP} files/Makefile.conf ${WRKSRC})
 .for i in ${EXTRA_MODULES}
 	@${REINPLACE_CMD} -e "s/\(^include_modules=.*\)/\1 ${i}/" ${WRKSRC}/Makefile.conf
 .endfor
 
 do-configure-DEBUG-off:
 	@${REINPLACE_CMD} -e "s/^#DEFS+= -DNO_DEBUG/DEFS+= -DNO_DEBUG/" ${WRKSRC}/Makefile.conf
 
 do-install-TESTS-on:
 	${CP} -r ${WRKSRC}/test ${STAGEDIR}${PREFIX}/tests/${PORTNAME}
 
 do-install-EXAMPLES-on:
 	${CP} -r ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/examples/${PORTNAME}
 
 post-install-RADIUS-on:
 	${MV} ${STAGEDIR}${ETCDIR}/dictionary.opensips ${STAGEDIR}${ETCDIR}/dictionary.opensips.sample
 
 .include <bsd.port.mk>
diff --git a/net/opensips31/distinfo b/net/opensips31/distinfo
index c5c80d20c68d..a3451f41a5ee 100644
--- a/net/opensips31/distinfo
+++ b/net/opensips31/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622537802
-SHA256 (opensips-3.1.2.tar.gz) = 557b33db1436d8212ac122f299481bee3f2957f060a2bc0b4256430faf8b3bbc
-SIZE (opensips-3.1.2.tar.gz) = 6362581
+TIMESTAMP = 1634746921
+SHA256 (opensips-3.1.6.tar.gz) = 45da5e82f99ca00930a7cb98403b94bcab1b063e2eded50fa649c452dafd9527
+SIZE (opensips-3.1.6.tar.gz) = 6466045
diff --git a/net/opensips31/files/patch-Makefile.defs b/net/opensips31/files/patch-Makefile.defs
index 28575700e48c..f84d1efa6bce 100644
--- a/net/opensips31/files/patch-Makefile.defs
+++ b/net/opensips31/files/patch-Makefile.defs
@@ -1,21 +1,21 @@
---- Makefile.defs.orig
+--- Makefile.defs.orig	2021-10-20 11:23:25 UTC
 +++ Makefile.defs
-@@ -57,14 +57,15 @@
+@@ -57,14 +57,15 @@ else
  makefile_defs=1
  export makefile_defs
  
 -# main binary name
 -MAIN_NAME=opensips
 -
  #version number
  VERSION_MAJOR = 3
  VERSION_MINOR = 1
- VERSION_SUBMINOR = 2
+ VERSION_SUBMINOR = 6
  VERSION_BUILD =
 +
 +# main binary name
 +NAME_SUFFIX=$(VERSION_MAJOR)$(VERSION_MINOR)
 +MAIN_NAME=opensips$(NAME_SUFFIX)
  
  ifneq (,$(VERSION_BUILD))
  RELEASE=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SUBMINOR)-$(VERSION_BUILD)