Index: gnu/usr.bin/diff3/Makefile
===================================================================
--- gnu/usr.bin/diff3/Makefile
+++ gnu/usr.bin/diff3/Makefile
@@ -1,8 +1,9 @@
+PACKAGE= diff3
+
 DIFFSRC=${SRCTOP}/contrib/diff/src
 .PATH:  ${DIFFSRC} \
 	${SRCTOP}/contrib/diff/lib \
 	${SRCTOP}/contrib/diff/man
-
 PROG=		diff3
 SRCS=           diff3.c version-etc.c \
 		xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c
Index: release/packages/ucl/diff3-all.ucl
===================================================================
--- /dev/null
+++ release/packages/ucl/diff3-all.ucl
@@ -0,0 +1,9 @@
+comment = "GNU 3-way file comparison and merge utility"
+
+desc = <<EOD
+Compares three files line by line, optionally merging them.
+EOD
+
+annotations {
+	set = "optional,optional-jail"
+}