diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1f8c2daa..feab89f3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,7 @@ find_package(RDMACM)
 find_package(Etherlab)
 find_package(Lua)
 find_package(LibDataChannel)
+find_package(re)
 
 # Check for tools
 find_program(PASTE NAMES paste)
@@ -117,13 +118,7 @@ pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
 if(NOT NANOMSG_FOUND)
     pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
 endif()
-pkg_check_modules(RE IMPORTED_TARGET re>=2.9.0)
-if(NOT RE_FOUND)
-    pkg_check_modules(RE IMPORTED_TARGET libre>=2.9.0)
-endif()
-if(NOT RE_FOUND)
-    pkg_check_modules(RE IMPORTED_TARGET re2)
-endif()
+
 
 if (REDISPP_FOUND)
     file(READ "${REDISPP_INCLUDEDIR}/sw/redis++/tls.h" CONTENTS)
diff --git a/include/villas/nodes/rtp.hpp b/include/villas/nodes/rtp.hpp
index 919b82ca2..f1e0dca3b 100644
--- a/include/villas/nodes/rtp.hpp
+++ b/include/villas/nodes/rtp.hpp
@@ -21,6 +21,7 @@
 #include <villas/queue_signalled.h>
 
 extern "C" {
+#include <re/re_types.h>
 #include <re/re_rtp.h>
 #include <re/re_sa.h>
 }
diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt
index 3625dc7cc..171cb63cd 100644
--- a/lib/nodes/CMakeLists.txt
+++ b/lib/nodes/CMakeLists.txt
@@ -143,7 +143,7 @@ endif()
 # Enable RTP node type when libre is available
 if(WITH_NODE_RTP)
     list(APPEND NODE_SRC rtp.cpp)
-    list(APPEND LIBRARIES PkgConfig::RE)
+    list(APPEND LIBRARIES re)
 endif()
 
 # Enable CAN node type
diff --git a/lib/nodes/rtp.cpp b/lib/nodes/rtp.cpp
index 17141e4a6..a503ef326 100644
--- a/lib/nodes/rtp.cpp
+++ b/lib/nodes/rtp.cpp
@@ -16,6 +16,7 @@
 
 extern "C" {
 // clang-format off
+#include <re/re_types.h>
 #include <re/re_net.h>
 #include <re/re_main.h>
 #include <re/re_types.h>
diff --git a/packaging/deps.sh b/packaging/deps.sh
index 2b12b9231..cb5e21c3c 100644
--- a/packaging/deps.sh
+++ b/packaging/deps.sh
@@ -290,9 +290,9 @@ if ! pkg-config "comedilib >= 0.11.0" && \
 fi
 
 # Build & Install libre
-if ! pkg-config "libre >= 2.9.0" && \
+if ! pkg-config "libre >= 3.6.0" && \
     should_build "libre" "for the rtp node-type"; then
-    git clone ${GIT_OPTS} --branch v2.9.0 https://github.com/baresip/re.git
+    git clone ${GIT_OPTS} --branch v3.6.0 https://github.com/baresip/re.git
     pushd re
     make ${MAKE_OPTS} install
     popd
diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch
index a7f858de6..1c07499db 100644
--- a/packaging/docker/Dockerfile.debian-multiarch
+++ b/packaging/docker/Dockerfile.debian-multiarch
@@ -56,7 +56,6 @@ RUN apt-get update && \
 		libibverbs-dev:${ARCH} \
 		librdmacm-dev:${ARCH} \
 		libusb-1.0-0-dev:${ARCH} \
-		libre-dev:${ARCH} \
 		liblua5.3-dev:${ARCH} \
 		libhiredis-dev:${ARCH} \
 		libmodbus-dev:${ARCH}
@@ -151,7 +150,6 @@ RUN apt-get update && \
 		libibverbs1:${ARCH} \
 		librdmacm1:${ARCH} \
 		libusb-1.0-0:${ARCH} \
-		libre0:${ARCH} \
 		liblua5.3-0:${ARCH} \
 		libhiredis0.14:${ARCH} \
 		libmodbus5:${ARCH} && \