diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index f6cec837a41d..483749b0f48f 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -39,7 +39,6 @@
 # done
 
 # 20140614: send-pr removal
-OLD_FILES+=usr/bin/send-pr
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index ba9d0a5efcf4..8b374a9b1ea0 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -143,6 +143,7 @@ SUBDIR=	alias \
 	rwall \
 	script \
 	sed \
+	send-pr \
 	seq \
 	shar \
 	showmount \
diff --git a/usr.bin/send-pr/Makefile b/usr.bin/send-pr/Makefile
new file mode 100644
index 000000000000..2b422bf315a8
--- /dev/null
+++ b/usr.bin/send-pr/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SCRIPTS= send-pr.sh
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/send-pr/send-pr.sh b/usr.bin/send-pr/send-pr.sh
new file mode 100755
index 000000000000..ab59040dd6ef
--- /dev/null
+++ b/usr.bin/send-pr/send-pr.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+echo
+echo "FreeBSD has migrated away from GNATS for tracking bugs, and so send-pr"
+echo "is no longer used for submitting bug reports."
+echo "Please see https://www.freebsd.org/support.html for more information."
+echo
+exit 1