diff --git a/net/uvgrtp/Makefile b/net/uvgrtp/Makefile
index aac8115be785..983355c3e2bf 100644
--- a/net/uvgrtp/Makefile
+++ b/net/uvgrtp/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	3.1.6
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Open-source C++ library for RTP/SRTP media delivery
 WWW=		https://ultravideo.fi/uvgrtp.html
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++17-lang pkgconfig
 CMAKE_ARGS=	-DPKG_CONFIG_PATH:STRING=libdata/pkgconfig
 CMAKE_ON=	UVGRTP_DISABLE_EXAMPLES UVGRTP_DISABLE_TESTS \
-		UVGRTP_RELEASE_COMMIT
-LDFLAGS_i386=	-Wl,-znotext
+		UVGRTP_RELEASE_COMMIT BUILD_SHARED_LIBS
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ultravideo
 GH_PROJECT=	uvgRTP
 
 .include <bsd.port.mk>
diff --git a/net/uvgrtp/files/patch-CMakeLists.txt b/net/uvgrtp/files/patch-CMakeLists.txt
index 8de1f8941968..6b263409e575 100644
--- a/net/uvgrtp/files/patch-CMakeLists.txt
+++ b/net/uvgrtp/files/patch-CMakeLists.txt
@@ -1,20 +1,15 @@
 --- CMakeLists.txt.orig	2025-03-20 09:59:25 UTC
 +++ CMakeLists.txt
-@@ -49,7 +49,7 @@ include(cmake/FindDependencies.cmake)
- include(cmake/Versioning.cmake)
- 
- 
--add_library(${PROJECT_NAME})
-+add_library(${PROJECT_NAME} SHARED)
- set_target_properties(${PROJECT_NAME} PROPERTIES
-         SOVERSION "${PROJECT_VERSION_MAJOR}"
-         VERSION "${LIBRARY_VERSION}"
-@@ -239,7 +239,7 @@ if (UNIX)
+@@ -239,10 +239,10 @@ if (UNIX)
              list(APPEND UVGRTP_LINKER_FLAGS "-lpthread")
          endif()
          # Check PKG_CONFIG_PATH, if not defined, use lib/pkgconfig
 -        if(NOT DEFINED ENV{PKG_CONFIG_PATH})
 +        if(NOT DEFINED PKG_CONFIG_PATH)
              set(PKG_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
              message("PKG_CONFIG_PATH is not set. Setting it to ${PKG_CONFIG_PATH}")
-         endif(NOT DEFINED ENV{PKG_CONFIG_PATH})
+-        endif(NOT DEFINED ENV{PKG_CONFIG_PATH})
++        endif()
+ 
+         # Find crypto++
+         if(NOT UVGRTP_DISABLE_CRYPTO)
diff --git a/net/uvgrtp/files/patch-cmake_Versioning.cmake b/net/uvgrtp/files/patch-cmake_Versioning.cmake
new file mode 100644
index 000000000000..5597aca17efd
--- /dev/null
+++ b/net/uvgrtp/files/patch-cmake_Versioning.cmake
@@ -0,0 +1,11 @@
+--- cmake/Versioning.cmake.orig	2025-03-20 09:59:25 UTC
++++ cmake/Versioning.cmake
+@@ -31,6 +31,8 @@ configure_file(cmake/version.cc.in version.cc
+         )
+ add_library(${PROJECT_NAME}_version OBJECT
+         ${CMAKE_CURRENT_BINARY_DIR}/version.cc)
++set_target_properties(${PROJECT_NAME}_version PROPERTIES
++    POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
+ target_include_directories(${PROJECT_NAME}_version
+         PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
+         )