diff --git a/tools/regression/usr.bin/Makefile b/tools/regression/usr.bin/Makefile
index dc23b26bba4..64d6d45ab89 100644
--- a/tools/regression/usr.bin/Makefile
+++ b/tools/regression/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	file2c uudecode uuencode xargs
+SUBDIR=	file2c join uudecode uuencode xargs
 
 .include <bsd.subdir.mk>
diff --git a/tools/regression/usr.bin/join/Makefile b/tools/regression/usr.bin/join/Makefile
new file mode 100644
index 00000000000..99036706a81
--- /dev/null
+++ b/tools/regression/usr.bin/join/Makefile
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+all:
+	@sh ${.CURDIR}/regress.sh ${.CURDIR}
diff --git a/tools/regression/usr.bin/join/regress.1.in b/tools/regression/usr.bin/join/regress.1.in
new file mode 100644
index 00000000000..975bbaf13b3
--- /dev/null
+++ b/tools/regression/usr.bin/join/regress.1.in
@@ -0,0 +1,4 @@
+!Name,Data1
+Foo,1
+Bar,2
+Baz,3
diff --git a/tools/regression/usr.bin/join/regress.2.in b/tools/regression/usr.bin/join/regress.2.in
new file mode 100644
index 00000000000..0206b49fda5
--- /dev/null
+++ b/tools/regression/usr.bin/join/regress.2.in
@@ -0,0 +1,4 @@
+!Name,Data2
+Foo,Bar
+Baz,2
+Foobar,1
diff --git a/tools/regression/usr.bin/join/regress.out b/tools/regression/usr.bin/join/regress.out
new file mode 100644
index 00000000000..fa75c88052a
--- /dev/null
+++ b/tools/regression/usr.bin/join/regress.out
@@ -0,0 +1,5 @@
+!Name,Data1,Data2
+Foo,1,Bar
+Bar,2,(unknown)
+Baz,3,2
+Foobar,(unknown),1
diff --git a/tools/regression/usr.bin/join/regress.sh b/tools/regression/usr.bin/join/regress.sh
new file mode 100644
index 00000000000..5e9eea40481
--- /dev/null
+++ b/tools/regression/usr.bin/join/regress.sh
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+# Go into the regression test directory, handed to us by make(1)
+TESTDIR=$1
+if [ -z "$TESTDIR" ]; then
+  TESTDIR=.
+fi
+cd $TESTDIR
+
+join -t , -a1 -a2 -e '(unknown)' -o 0,1.2,2.2 regress.1.in regress.2.in | \
+  diff -u regress.out -
+if [ $? -eq 0 ]; then
+  echo "Test detected no regression, output matches."
+else
+  echo "Test failed: regression detected.  See above."
+  exit 1
+fi