diff --git a/composer.json b/composer.json
index e4fe82b3..21848d8a 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": "^5.5.9",
         "laravel/framework": "~5.1.6",
-        "alt-three/emoji": "^1.0",
+        "alt-three/emoji": "^1.1",
         "barryvdh/laravel-cors": "^0.5",
         "doctrine/dbal": "^2.5",
         "fideloper/proxy": "^3.0",
diff --git a/config/emoji.php b/config/emoji.php
new file mode 100644
index 00000000..d7964b23
--- /dev/null
+++ b/config/emoji.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | GitHub Token
+    |--------------------------------------------------------------------------
+    |
+    | Here you may get us to use your personal github access token to increase
+    | your rate limit while contacting GitHub's API.
+    |
+    */
+
+    'token' => env('GITHUB_TOKEN', null),
+
+];