diff --git a/share/misc/dev2github.awk b/share/misc/dev2github.awk
new file mode 100644
--- /dev/null
+++ b/share/misc/dev2github.awk
@@ -0,0 +1,38 @@
+#!/usr/bin/awk -f
+
+BEGIN {
+	if (ARGC < 3) {
+		print "Usage: " ARGV[0] " <map file> <ID1> [<ID2> ...]"
+		exit 1
+	}
+	for (i = 2; i < ARGC; i++) {
+		lookup[i] = ARGV[i]
+		delete ARGV[i]
+	}
+}
+
+{
+	if ($1 !~ /^[[:space:]]*#/ && $1 != "") {
+		if (NF != 2) {
+			print "Error: line " NR " is invalid"
+			exit 1
+		}
+		ids[$1] = $2
+		if ($1 ~ /.*@FreeBSD.org/) {
+			split($1, email, "@")
+			ids[email[1]] = $2
+			ids[email[1] "@freebsd.org"] = $2
+		}
+	}
+}
+
+END {
+	for (id in lookup) {
+		key = lookup[id]
+		if (ids[key] == "") {
+			print "Error: ID " key " not found"
+			exit 1
+		}
+		print ids[key]
+	}
+}
diff --git a/share/misc/github_ids b/share/misc/github_ids
new file mode 100644
--- /dev/null
+++ b/share/misc/github_ids
@@ -0,0 +1,22 @@
+# A map of FreeBSD developer users to GitHub user IDs.
+#
+# This is used by some automation to auto-add GitHub users to code review
+# requests.
+#
+# At some point it may be useful to store non-freebsd.org usernames here,
+# so let's keep the @FreeBSD.org suffixes for now.
+
+andrew@FreeBSD.org		zxombie
+asomers@FreeBSD.org		asomers
+bapt@FreeBSD.org		bapt
+cperciva@FreeBSD.org		cperciva
+des@FreeBSD.org			dag-erling
+dim@FreeBSD.org			DimitryAndric
+emaste@FreeBSD.org		emaste
+glebius@FreeBSD.org		glebius
+imp@FreeBSD.org			bsdimp
+jhb@FreeBSD.org			bsdjhb
+kevans@FreeBSD.org		kevans91
+lwhsu@FreeBSD.org		lwhsu
+manu@FreeBSD.org		evadot
+markj@FreeBSD.org		markjdb