diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb
index b5d920bab0..a905968f92 100644
--- a/Library/Homebrew/requirements.rb
+++ b/Library/Homebrew/requirements.rb
@@ -57,6 +57,8 @@ class X11Dependency < Requirement
 
   fatal true
 
+  env { x11 }
+
   def initialize(*tags)
     tags.flatten!
     @min_version = tags.shift if /(\d\.)+\d/ === tags.first
@@ -74,10 +76,6 @@ class X11Dependency < Requirement
     EOS
   end
 
-  def modify_build_environment
-    ENV.x11
-  end
-
   def <=> other
     unless other.is_a? X11Dependency
       raise TypeError, "expected X11Dependency"
@@ -142,11 +140,11 @@ class MPIDependency < Requirement
     @unknown_langs.empty? and @non_functional.empty?
   end
 
-  def modify_build_environment
+  env do |req|
     # Set environment variables to help configure scripts find MPI compilers.
     # Variable names taken from:
     # http://www.gnu.org/software/autoconf-archive/ax_mpi.html
-    lang_list.each do |lang|
+    req.lang_list.each do |lang|
       compiler = 'mpi' + lang.to_s
       mpi_path = which compiler