diff --git a/.gitmodules b/.gitmodules
index a8067ae456..610f2daefe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "git/git-win32"]
 	path = git/git-win32
 	url = git@github.com:desktop/git-win32.git
+[submodule "gemoji"]
+	path = gemoji
+	url = git@github.com:github/gemoji.git
diff --git a/gemoji b/gemoji
new file mode 160000
index 0000000000..50865e8895
--- /dev/null
+++ b/gemoji
@@ -0,0 +1 @@
+Subproject commit 50865e8895c54037bf06c4c1691aa925d030a59d