diff --git a/Rails.gitignore b/Rails.gitignore
index 38ba1b5b38c5956115309adc6b4097c511072ac6..cec0a75d1bb6de72cab0e43330015ebb9ea3959d 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -1,8 +1,6 @@
 *.rbc
 capybara-*.html
 .rspec
-/log
-/tmp
 /db/*.sqlite3
 /db/*.sqlite3-journal
 /public/system
@@ -12,6 +10,12 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
 # TODO Comment out this rule if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
 config/master.key
@@ -59,4 +63,4 @@ yarn-debug.log*
 
 # Ignore uploaded files in development
 /storage/*
-!/storage/.keep
\ No newline at end of file
+!/storage/.keep