diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 29a3870cd744..8159e1fd02ab 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -527,18 +527,69 @@ OLD_FILES+=usr/share/man/man1/calendar.1.gz
 .endif
 
 .if ${MK_CDDL} == no
-OLD_LIBS+=lib/libavl.so.1
-OLD_LIBS+=lib/libnvpair.so.1
-OLD_LIBS+=lib/libumem.so.1
-OLD_LIBS+=lib/libuutil.so.1
+OLD_LIBS+=lib/libavl.so.2
+OLD_LIBS+=lib/libctf.so.2
+OLD_LIBS+=lib/libdtrace.so.2
+OLD_LIBS+=lib/libnvpair.so.2
+OLD_LIBS+=lib/libumem.so.2
+OLD_LIBS+=lib/libuutil.so.2
+OLD_FILES+=usr/bin/ctfconvert
+OLD_FILES+=usr/bin/ctfdump
+OLD_FILES+=usr/bin/ctfmerge
+OLD_FILES+=usr/bin/sgsmsg
+OLD_FILES+=usr/lib/dtrace/drti.o
+OLD_FILES+=usr/lib/dtrace/errno.d
+OLD_FILES+=usr/lib/dtrace/psinfo.d
+OLD_FILES+=usr/lib/dtrace/signal.d
+OLD_FILES+=usr/lib/dtrace/unistd.d
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
+OLD_FILES+=usr/lib/libavl_p.a
+OLD_FILES+=usr/lib/libctf.a
+OLD_FILES+=usr/lib/libctf.so
+OLD_FILES+=usr/lib/libctf_p.a
+OLD_FILES+=usr/lib/libdtrace.a
+OLD_FILES+=usr/lib/libdtrace.so
+OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_FILES+=usr/lib/libnvpair.a
 OLD_FILES+=usr/lib/libnvpair.so
+OLD_FILES+=usr/lib/libnvpair_p.a
 OLD_FILES+=usr/lib/libumem.a
 OLD_FILES+=usr/lib/libumem.so
+OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libuutil.a
 OLD_FILES+=usr/lib/libuutil.so
+OLD_FILES+=usr/lib/libuutil_p.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/dtrace/drti.o
+OLD_FILES+=usr/lib32/libavl.a
+OLD_FILES+=usr/lib32/libavl.so
+OLD_LIBS+=usr/lib32/libavl.so.2
+OLD_FILES+=usr/lib32/libavl_p.a
+OLD_FILES+=usr/lib32/libctf.a
+OLD_FILES+=usr/lib32/libctf.so
+OLD_LIBS+=usr/lib32/libctf.so.2
+OLD_FILES+=usr/lib32/libctf_p.a
+OLD_FILES+=usr/lib32/libdtrace.a
+OLD_FILES+=usr/lib32/libdtrace.so
+OLD_LIBS+=usr/lib32/libdtrace.so.2
+OLD_FILES+=usr/lib32/libdtrace_p.a
+OLD_FILES+=usr/lib32/libnvpair.a
+OLD_FILES+=usr/lib32/libnvpair.so
+OLD_LIBS+=usr/lib32/libnvpair.so.2
+OLD_FILES+=usr/lib32/libnvpair_p.a
+OLD_FILES+=usr/lib32/libumem.a
+OLD_FILES+=usr/lib32/libumem.so
+OLD_LIBS+=usr/lib32/libumem.so.2
+OLD_FILES+=usr/lib32/libumem_p.a
+OLD_FILES+=usr/lib32/libuutil.a
+OLD_FILES+=usr/lib32/libuutil.so
+OLD_LIBS+=usr/lib32/libuutil.so.2
+OLD_FILES+=usr/lib32/libuutil_p.a
+.endif
+OLD_FILES+=usr/sbin/dtrace
+OLD_FILES+=usr/sbin/lockstat
+OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 .endif
 
 .if ${MK_ZFS} == no