diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 353816a0cea0..488c644c9fd2 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -196,6 +196,7 @@ SUBDIR=	alias \
 	xargs \
 	xinstall \
 	${_xlint} \
+	xo \
 	${_xstr} \
 	xz \
 	xzdec \
diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile
new file mode 100644
index 000000000000..c7b51d8e1d86
--- /dev/null
+++ b/usr.bin/xo/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+LIBXO=	${.CURDIR:H:H}/contrib/libxo
+
+.PATH:	${LIBXO}/xo
+
+PROG=	xo
+MAN=	xo.1
+
+# XXX For xoversion.h
+CFLAGS+=-I${LIBXO}/libxo
+
+DPADD=	${LIBXO}
+LDADD=	-lxo
+
+.include <bsd.prog.mk>