diff --git a/audio/re/Makefile b/audio/re/Makefile
index 71fa957846a3e..7c4c7a8d03e29 100644
--- a/audio/re/Makefile
+++ b/audio/re/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=	re
-PORTVERSION=	0.5.8
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.12.0
 CATEGORIES=	audio devel
-MASTER_SITES=	http://www.creytiv.com/pub/
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Library for real-time comms with async IO support
-WWW=		http://www.creytiv.com/re.html
+WWW=		https://github.com/baresip
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/docs/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake ssl
-USE_LDCONFIG=	yes
-MAKE_ARGS+=	SYSROOT_ALT=${OPENSSLBASE}
+USES=		cmake ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	baresip
 
-PORTDATA=	re.mk
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC}/include && \
-	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
-	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}
-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib
+# FIXME values of the next 3 variables taken from source code Makefile
+ABI_MAJOR=	14
+ABI_AGE=	12
+ABI_REV=	0
+PLIST_SUB=	ABI_MAJOR=${ABI_MAJOR}
+PLIST_SUB+=	ABI_AGE=${ABI_AGE}
+PLIST_SUB+=	ABI_REV=${ABI_REV}
 
 .include <bsd.port.mk>
diff --git a/audio/re/distinfo b/audio/re/distinfo
index af6bda9237789..36334130d912c 100644
--- a/audio/re/distinfo
+++ b/audio/re/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524574824
-SHA256 (re-0.5.8.tar.gz) = 190fd652da167d8d6351b7a26fa0aef2ddab75fe5e8d5de77edf023988440e70
-SIZE (re-0.5.8.tar.gz) = 301351
+TIMESTAMP = 1679632225
+SHA256 (baresip-re-v2.12.0_GH0.tar.gz) = efc387c9f06cac3f0a70e14a8da9d986cb15580e4712a496df66f3fb0257ac9b
+SIZE (baresip-re-v2.12.0_GH0.tar.gz) = 394411
diff --git a/audio/re/files/patch-mk_re.mk b/audio/re/files/patch-mk_re.mk
deleted file mode 100644
index 1e77f47ec8f55..0000000000000
--- a/audio/re/files/patch-mk_re.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- mk/re.mk.orig	2016-04-15 07:09:59 UTC
-+++ mk/re.mk
-@@ -75,9 +75,6 @@ endif
- ifeq ($(CC),)
- 	CC := gcc
- endif
--ifeq ($(CC),cc)
--	CC := gcc
--endif
- LD := $(CC)
- CC_LONGVER := $(shell if $(CC) -v 2>/dev/null; then \
- 						$(CC) -v 2>&1 ;\
diff --git a/audio/re/files/patch-src_sip_auth.c b/audio/re/files/patch-src_sip_auth.c
new file mode 100644
index 0000000000000..3e5f6743dd0c0
--- /dev/null
+++ b/audio/re/files/patch-src_sip_auth.c
@@ -0,0 +1,12 @@
+--- src/sip/auth.c.orig	2022-10-01 08:24:34 UTC
++++ src/sip/auth.c
+@@ -3,6 +3,9 @@
+  *
+  * Copyright (C) 2010 Creytiv.com
+  */
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
+ #include <time.h>
+ #include <string.h>
+ #include <re_types.h>
diff --git a/audio/re/pkg-plist b/audio/re/pkg-plist
index 4769ba8a6d139..7da026be658bf 100644
--- a/audio/re/pkg-plist
+++ b/audio/re/pkg-plist
@@ -1,13 +1,19 @@
 include/re/re.h
 include/re/re_aes.h
+include/re/re_async.h
+include/re/re_atomic.h
+include/re/re_av1.h
 include/re/re_base64.h
 include/re/re_bfcp.h
-include/re/re_bitv.h
+include/re/re_btrace.h
 include/re/re_conf.h
+include/re/re_convert.h
 include/re/re_crc32.h
 include/re/re_dbg.h
 include/re/re_dns.h
 include/re/re_fmt.h
+include/re/re_h264.h
+include/re/re_h265.h
 include/re/re_hash.h
 include/re/re_hmac.h
 include/re/re_http.h
@@ -16,7 +22,6 @@ include/re/re_ice.h
 include/re/re_jbuf.h
 include/re/re_json.h
 include/re/re_list.h
-include/re/re_lock.h
 include/re/re_main.h
 include/re/re_mbuf.h
 include/re/re_md5.h
@@ -24,13 +29,16 @@ include/re/re_mem.h
 include/re/re_mod.h
 include/re/re_mqueue.h
 include/re/re_msg.h
-include/re/re_natbd.h
 include/re/re_net.h
 include/re/re_odict.h
+include/re/re_pcp.h
+include/re/re_rtmp.h
 include/re/re_rtp.h
+include/re/re_rtpext.h
 include/re/re_sa.h
 include/re/re_sdp.h
 include/re/re_sha.h
+include/re/re_shim.h
 include/re/re_sip.h
 include/re/re_sipevent.h
 include/re/re_sipreg.h
@@ -40,12 +48,20 @@ include/re/re_stun.h
 include/re/re_sys.h
 include/re/re_tcp.h
 include/re/re_telev.h
+include/re/re_thread.h
 include/re/re_tls.h
 include/re/re_tmr.h
+include/re/re_trace.h
+include/re/re_trice.h
 include/re/re_turn.h
 include/re/re_types.h
 include/re/re_udp.h
+include/re/re_unixsock.h
 include/re/re_uri.h
 include/re/re_websock.h
+lib/cmake/re/re-config.cmake
 lib/libre.a
 lib/libre.so
+lib/libre.so.%%ABI_MAJOR%%
+lib/libre.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
+libdata/pkgconfig/libre.pc