diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index 06641d0e14..14ab93d0f5 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -121,6 +121,7 @@ class SystemConfig
         HOMEBREW_REPOSITORY:    Homebrew::DEFAULT_REPOSITORY,
         HOMEBREW_CELLAR:        Homebrew::DEFAULT_CELLAR,
         HOMEBREW_CACHE:         "#{ENV["HOME"]}/Library/Caches/Homebrew",
+        HOMEBREW_LOGS:          "#{ENV["HOME"]}/Library/Logs/Homebrew",
         HOMEBREW_TEMP:          ENV["HOMEBREW_SYSTEM_TEMP"],
         HOMEBREW_RUBY_WARNINGS: "-W0",
       }.freeze
@@ -154,12 +155,11 @@ class SystemConfig
         HOMEBREW_VERSION
       ].freeze
       f.puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}"
-      if defaults_hash[:HOMEBREW_REPOSITORY] != HOMEBREW_REPOSITORY.to_s
-        f.puts "HOMEBREW_REPOSITORY: #{HOMEBREW_REPOSITORY}"
+      [:HOMEBREW_CELLAR, :HOMEBREW_CACHE, :HOMEBREW_LOGS, :HOMEBREW_REPOSITORY,
+       :HOMEBREW_TEMP].each do |key|
+        value = Object.const_get(key)
+        f.puts "#{key}: #{value}" if defaults_hash[key] != value.to_s
       end
-      f.puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" if defaults_hash[:HOMEBREW_CELLAR] != HOMEBREW_CELLAR.to_s
-      f.puts "HOMEBREW_CACHE: #{HOMEBREW_CACHE}" if defaults_hash[:HOMEBREW_CACHE] != HOMEBREW_CACHE.to_s
-      f.puts "HOMEBREW_TEMP: #{HOMEBREW_TEMP}" if defaults_hash[:HOMEBREW_TEMP] != HOMEBREW_TEMP.to_s
       if defaults_hash[:HOMEBREW_RUBY_WARNINGS] != ENV["HOMEBREW_RUBY_WARNINGS"].to_s
         f.puts "HOMEBREW_RUBY_WARNINGS: #{ENV["HOMEBREW_RUBY_WARNINGS"]}"
       end