diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 4d7bb8a82e1c..568733801a6b 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,21 +1,22 @@
+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
 
 # Important for ctype macros!
 CFLAGS+=-funsigned-char
 
 CFLAGS+=-I${SRCTOP}/contrib/diff/
 CFLAGS+=-I${SRCTOP}/contrib/diff/src
 CFLAGS+=-I${SRCTOP}/contrib/diff/lib
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
 
 WARNS?=	0
 
 .include <bsd.prog.mk>
diff --git a/release/packages/ucl/diff3-all.ucl b/release/packages/ucl/diff3-all.ucl
new file mode 100644
index 000000000000..b4e53e63c67f
--- /dev/null
+++ b/release/packages/ucl/diff3-all.ucl
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: ISC
+ */
+
+comment = "GNU 3-way file comparison and merge utility"
+
+desc = <<EOD
+Compares three files line by line, optionally merging them.
+EOD
+
+licenses = [ "GPL-2.0-or-later" ]
+
+annotations {
+	set = "optional,optional-jail"
+}