diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 3462d7ed9b95..fd543870cd73 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -249,6 +249,8 @@
     ..
     libmilter
     ..
+    libxo
+    ..
     lzma
     ..
     machine
diff --git a/lib/Makefile b/lib/Makefile
index b683a90f6ff9..b1f0de0dd908 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -106,6 +106,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libvgl} \
 	${_libvmmapi} \
 	libwrap \
+	libxo \
 	liby \
 	${_libypclnt} \
 	libz \
diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile
new file mode 100644
index 000000000000..644b71f4a9c6
--- /dev/null
+++ b/lib/libxo/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+LIBXO=	${.CURDIR:H:H}/contrib/libxo
+
+.PATH:	${LIBXO}/libxo
+
+LIB=	xo
+SHLIB_MAJOR=0
+
+SRCS=	libxo.c
+
+CFLAGS+=-I${LIBXO}/libxo
+
+INCS=	xo.h
+INCSDIR=${INCLUDEDIR}/libxo
+
+MAN+=	libxo.3
+MAN+=	xo_attr.3 \
+	xo_create.3 \
+	xo_emit.3 \
+	xo_err.3 \
+	xo_finish.3 \
+	xo_flush.3 \
+	xo_no_setlocale.3 \
+	xo_open_container.3 \
+	xo_open_list.3 \
+	xo_parse_args.3 \
+	xo_set_allocator.3 \
+	xo_set_flags.3 \
+	xo_set_info.3 \
+	xo_set_options.3 \
+	xo_set_style.3 \
+	xo_set_writer.3
+MAN+=	xo_format.5
+
+.include <bsd.lib.mk>