diff --git a/.gitignore b/.gitignore
index 522bc7c9..ff9b6771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,18 +6,18 @@
 config/database.yml
 config/site.yml
 config/deploy.rb
-db/*.sqlite3
-db/*.db
+/db/*.sqlite3
+/db/*.db
 db/data.yml
 db/schema.rb
-log
+/log/*.log
 nbproject
-tmp
+/tmp
 vendor/plugins/query_trace/
 rerun.txt
 .idea
 .rvmrc
 .yardoc
 tags
-/.bundle/
+/.bundle
 /public/assets/
diff --git a/log/.gitkeep b/log/.gitkeep
new file mode 100644
index 00000000..e69de29b