diff --git a/.gitignore b/.gitignore
index d66a04a22..3bf1301ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,9 +91,12 @@ whoosh_index
 collected_static
 bower
 bower_components
-media
 whoosh/
 solr-4.10.2/
 postgres-data/
 data/
-solr-*/
\ No newline at end of file
+solr-*/
+
+# ignora tudo dentro de media, mas cria a pasta no checkout
+media/*
+!media/.gitkeep
diff --git a/media/.gitkeep b/media/.gitkeep
new file mode 100644
index 000000000..e69de29bb