diff --git a/devel/uid_wrapper/Makefile b/devel/uid_wrapper/Makefile
index e3172cbb6e09..4893b65cc1b6 100644
--- a/devel/uid_wrapper/Makefile
+++ b/devel/uid_wrapper/Makefile
@@ -1,31 +1,23 @@
-PORTNAME=		uid_wrapper
-PORTVERSION=		1.2.4
-PORTREVISION=		1
-CATEGORIES=		devel
-MASTER_SITES=		SAMBA/cwrap
+PORTNAME=	uid_wrapper
+PORTVERSION=	1.2.4
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	SAMBA/cwrap
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Wrapper to fake privilege separation
-WWW=		https://cwrap.org/uid_wrapper.html
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Testing tool to fake privilege separation
+WWW=		https://cwrap.org/uid_wrapper.html \
+		https://git.samba.org/?p=uid_wrapper.git
 
-LICENSE=		GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=			cmake
-USE_LDCONFIG=		yes
+TEST_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
 
-OPTIONS_DEFINE=		TEST
-OPTIONS_DEFAULT=	TEST
+USES=		cmake pathfix
 
-TEST_TEST_TARGET=	test
-TEST_CMAKE_BOOL=	UNIT_TESTING
-TEST_BUILD_DEPENDS=	cmocka>=1.1.1:sysutils/cmocka
-
-PLIST_FILES=		libdata/pkgconfig/uid_wrapper.pc \
-			lib/cmake/uid_wrapper/uid_wrapper-config-version.cmake \
-			lib/cmake/uid_wrapper/uid_wrapper-config.cmake \
-			lib/libuid_wrapper.so.0.0.6 \
-			lib/libuid_wrapper.so.0 \
-			lib/libuid_wrapper.so \
-			share/man/man1/uid_wrapper.1.gz
+CMAKE_OFF=	UNIT_TESTING
+CMAKE_TESTING_ON=	UNIT_TESTING
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/uid_wrapper/pkg-descr b/devel/uid_wrapper/pkg-descr
index 6bfb8a7dc4ad..a358f77c39fb 100644
--- a/devel/uid_wrapper/pkg-descr
+++ b/devel/uid_wrapper/pkg-descr
@@ -1,15 +1,13 @@
-- Allows uid switching as a normal user.
+Some projects, such as a file server, need privilege separation to be able to
+switch to the user who owns the files and do file operations on their behalf.
+uid_wrapper convincingly lies to the application, letting it believe it is
+operating as root and even switching between UIDs and GIDs as needed. You can
+start any application making it believe it is running as root.
 
+Features:
+- Allows uid switching as a normal user.
 - Start any application making it believe it is running as root.
-
-- Support for user/group changing in the local thread using the syscalls
-  (like glibc).
-
-- More precisely this library intercepts seteuid and related calls, and
-  simulates them in a manner similar to the nss_wrapper and socket_wrapper
-  libraries.
-
-Some projects like a file server need privilege separation to be able to switch
-to the connection user and do file operations. uid_wrapper convincingly lies to
-the application letting it believe it is operating as root and even switching
-between UIDs and GIDs as needed.
+- Support for user/group changing in the local thread using the syscalls (like
+  glibc).
+- uid_wrapper intercepts seteuid(2) and related calls and simulates them in a
+  way transparent to the application
diff --git a/devel/uid_wrapper/pkg-plist b/devel/uid_wrapper/pkg-plist
new file mode 100644
index 000000000000..cae4b8bcb36d
--- /dev/null
+++ b/devel/uid_wrapper/pkg-plist
@@ -0,0 +1,7 @@
+lib/cmake/uid_wrapper/uid_wrapper-config-version.cmake
+lib/cmake/uid_wrapper/uid_wrapper-config.cmake
+lib/libuid_wrapper.so
+lib/libuid_wrapper.so.0
+lib/libuid_wrapper.so.0.0.6
+libdata/pkgconfig/uid_wrapper.pc
+share/man/man1/uid_wrapper.1.gz