diff --git a/config/application.rb b/config/application.rb
index 88759ce..c532570 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -62,7 +62,9 @@ module Gitlab
 
     # Enable the asset pipeline
     config.assets.enabled = true
-
+    config.assets.paths << Emoji.images_path
+    config.assets.precompile << "emoji/*.png"
+    
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
--
libgit2 0.21.2