diff --git a/lib/libutil++/Makefile b/lib/libutil++/Makefile
index df3074c2278e..729a336ddb3a 100644
--- a/lib/libutil++/Makefile
+++ b/lib/libutil++/Makefile
@@ -1,20 +1,20 @@
-PACKAGE=	lib${LIB}
+PACKAGE=	clibs
 LIB_CXX=	util++
 INTERNALLIB=	true
 SHLIB_MAJOR=	1
 SRCS=		stringf.cc
 
 MAN+=	freebsd::FILE_up.3 \
 	freebsd::addrinfo_up.3 \
 	freebsd::fd_up.3 \
 	freebsd::malloc_up.3 \
 	freebsd::nvlist_up.3 \
 	freebsd::pidfile.3 \
 	freebsd::stringf.3
 
 .include <src.opts.mk>
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/release/packages/ucl/libutil++-all.ucl b/release/packages/ucl/libutil++-all.ucl
deleted file mode 100644
index dfd77215dbc5..000000000000
--- a/release/packages/ucl/libutil++-all.ucl
+++ /dev/null
@@ -1,4 +0,0 @@
-comment = "C++ utility library"
-desc = <<EOD
-libutil++ contains various C++ utility classes used by the base system.
-EOD