Index: head/contrib/mdocml/lib.in
===================================================================
--- head/contrib/mdocml/lib.in
+++ head/contrib/mdocml/lib.in
@@ -110,6 +110,7 @@
 LINE("libssp",		"Buffer Overflow Protection Library (libssp, \\-lssp)")
 LINE("libstdthreads",	"C11 Threads Library (libstdthreads, \\-lstdthreads)")
 LINE("libSystem",	"System Library (libSystem, \\-lSystem)")
+LINE("libsysdcode",	"System Argument Decoding Library (libsysdecode, \\-lsysdecode)")
 LINE("libtacplus",	"TACACS+ Client Library (libtacplus, \\-ltacplus)")
 LINE("libtcplay",	"TrueCrypt-compatible API library (libtcplay, \\-ltcplay)")
 LINE("libtermcap",	"Termcap Access Library (libtermcap, \\-ltermcap)")
Index: head/lib/Makefile
===================================================================
--- head/lib/Makefile
+++ head/lib/Makefile
@@ -98,6 +98,7 @@
 	libstand \
 	libstdbuf \
 	libstdthreads \
+	libsysdecode \
 	libtacplus \
 	${_libtelnet} \
 	${_libthr} \
Index: head/lib/libc/sys/utrace.2
===================================================================
--- head/lib/libc/sys/utrace.2
+++ head/lib/libc/sys/utrace.2
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 5, 2015
+.Dd December 11, 2015
 .Dt UTRACE 2
 .Os
 .Sh NAME
@@ -71,7 +71,8 @@
 .Xr kdump 1 ,
 .Xr ktrace 1 ,
 .Xr ktrace 2 ,
-.Xr truss 1
+.Xr truss 1 ,
+.Xr sysdecode_utrace 3
 .Sh HISTORY
 The
 .Fn utrace
Index: head/share/mk/bsd.libnames.mk
===================================================================
--- head/share/mk/bsd.libnames.mk
+++ head/share/mk/bsd.libnames.mk
@@ -134,6 +134,7 @@
 LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
 LIBSTDTHREADS?=	${DESTDIR}${LIBDIR}/libstdthreads.a
+LIBSYSDECODE?=	${DESTDIR}${LIBDIR}/libsysdecode.a
 LIBTACPLUS?=	${DESTDIR}${LIBDIR}/libtacplus.a
 LIBTERMCAP?=	${DESTDIR}${LIBDIR}/libtermcap.a
 LIBTERMCAPW?=	${DESTDIR}${LIBDIR}/libtermcapw.a
Index: head/share/mk/src.libnames.mk
===================================================================
--- head/share/mk/src.libnames.mk
+++ head/share/mk/src.libnames.mk
@@ -148,6 +148,7 @@
 		ssp_nonshared \
 		stdthreads \
 		supcplusplus \
+		sysdecode \
 		tacplus \
 		termcap \
 		termcapw \
Index: head/usr.bin/kdump/Makefile
===================================================================
--- head/usr.bin/kdump/Makefile
+++ head/usr.bin/kdump/Makefile
@@ -6,11 +6,12 @@
 .PATH: ${.CURDIR}/../ktrace
 
 PROG=		kdump
-SRCS=		kdump_subr.c kdump_subr.h kdump.c ioctl.c subr.c utrace.c
+SRCS=		kdump_subr.c kdump_subr.h kdump.c ioctl.c subr.c
 CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
 
+LIBADD=		sysdecode
 .if ${MK_CASPER} != "no"
-LIBADD=	capsicum
+LIBADD+=	capsicum
 CFLAGS+=-DHAVE_LIBCAPSICUM
 .endif
 
Index: head/usr.bin/kdump/Makefile.depend
===================================================================
--- head/usr.bin/kdump/Makefile.depend
+++ head/usr.bin/kdump/Makefile.depend
@@ -13,6 +13,7 @@
 	lib/libcapsicum \
 	lib/libcompiler_rt \
 	lib/libnv \
+	lib/libsysdecode \
 
 
 .include <dirdeps.mk>
Index: head/usr.bin/kdump/kdump.c
===================================================================
--- head/usr.bin/kdump/kdump.c
+++ head/usr.bin/kdump/kdump.c
@@ -83,6 +83,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysdecode.h>
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
@@ -116,7 +117,6 @@
 void limitfd(int fd);
 void usage(void);
 void ioctlname(unsigned long, int);
-int kdump_print_utrace(FILE *, void *, size_t, int);
 
 #define	TIMESTAMP_NONE		0x0
 #define	TIMESTAMP_ABSOLUTE	0x1
@@ -1541,7 +1541,7 @@
 {
 	unsigned char *cp;
 
-	if (kdump_print_utrace(stdout, p, len, decimal)) {
+	if (sysdecode_utrace(stdout, p, len)) {
 		printf("\n");
 		return;
 	}
Index: head/usr.bin/truss/Makefile
===================================================================
--- head/usr.bin/truss/Makefile
+++ head/usr.bin/truss/Makefile
@@ -4,8 +4,7 @@
 PROG=	truss
 SRCS=	cloudabi.c ioctl.c main.c setup.c syscalls.c
 
-.PATH:	${.CURDIR:H}/kdump
-SRCS+=	utrace.c
+LIBADD=	sysdecode
 
 CFLAGS+= -I${.CURDIR} -I. -I${.CURDIR}/../../sys
 CLEANFILES= ioctl.c
Index: head/usr.bin/truss/Makefile.depend.amd64
===================================================================
--- head/usr.bin/truss/Makefile.depend.amd64
+++ head/usr.bin/truss/Makefile.depend.amd64
@@ -11,6 +11,7 @@
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libsysdecode \
 
 
 .include <dirdeps.mk>
Index: head/usr.bin/truss/syscalls.c
===================================================================
--- head/usr.bin/truss/syscalls.c
+++ head/usr.bin/truss/syscalls.c
@@ -65,6 +65,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysdecode.h>
 #include <time.h>
 #include <unistd.h>
 #include <vis.h>
@@ -75,9 +76,6 @@
 #include "extern.h"
 #include "syscall.h"
 
-/* usr.bin/kdump/utrace.c */
-int kdump_print_utrace(FILE *, void *, size_t, int);
-
 /* 64-bit alignment on 32-bit platforms. */
 #if !defined(__LP64__) && defined(__powerpc__)
 #define	QUAD_ALIGN	1
@@ -1108,7 +1106,7 @@
 	unsigned char *utrace_buffer;
 
 	fprintf(fp, "{ ");
-	if (kdump_print_utrace(fp, utrace_addr, len, 0)) {
+	if (sysdecode_utrace(fp, utrace_addr, len)) {
 		fprintf(fp, " }");
 		return;
 	}