diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 96b8df3e20..f84cd12956 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -7,6 +7,8 @@ module Homebrew extend self
     formula_count = 0
     problem_count = 0
 
+    ENV.setup_build_environment
+
     ff = if ARGV.named.empty?
       Formula
     else
@@ -295,17 +297,14 @@ class FormulaAuditor
   end
 
   def audit_patches
-    # Some formulae use ENV in patches, so set up an environment
-    ENV.with_build_environment do
-      Patches.new(f.patches).select { |p| p.external? }.each do |p|
-        case p.url
-        when %r[raw\.github\.com], %r[gist\.github\.com/raw]
-          unless p.url =~ /[a-fA-F0-9]{40}/
-            problem "GitHub/Gist patches should specify a revision:\n#{p.url}"
-          end
-        when %r[macports/trunk]
-          problem "MacPorts patches should specify a revision instead of trunk:\n#{p.url}"
+    Patches.new(f.patches).select(&:external?).each do |p|
+      case p.url
+      when %r[raw\.github\.com], %r[gist\.github\.com/raw]
+        unless p.url =~ /[a-fA-F0-9]{40}/
+          problem "GitHub/Gist patches should specify a revision:\n#{p.url}"
         end
+      when %r[macports/trunk]
+        problem "MacPorts patches should specify a revision instead of trunk:\n#{p.url}"
       end
     end
   end