diff --git a/.gitignore b/.gitignore
index 600b404bc6c..4a6c9eef420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,10 +36,14 @@ config/discourse.conf
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
-/plugins
 /logfile
 log/
 
+# Ignore plugins except for the bundled ones.
+/plugins
+!/plugins/emoji
+!/plugins/poll
+
 /spec/fixtures/plugins/my_plugin/auto_generated
 
 # Ignore Eclipse .project file