diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index 6d1a596a60..6f235fedea 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -1,6 +1,3 @@
-
-HOMEBREW_LIBRARY = HOMEBREW_REPOSITORY/"Library"
-
 module Homebrew extend self
 
   def tap
diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index 92faf3069d..51d99d9137 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -3,15 +3,15 @@ require 'cmd/tap' # for tap_args
 module Homebrew extend self
   def untap
     user, repo = tap_args
-    tapd = HOMEBREW_PREFIX/"Library/Taps/#{user}-#{repo}"
+    tapd = HOMEBREW_LIBRARY/"Taps/#{user}-#{repo}"
 
     raise "No such tap!" unless tapd.directory?
 
-    gitignores = (HOMEBREW_PREFIX/"Library/Formula/.gitignore").read.split rescue []
+    gitignores = (HOMEBREW_LIBRARY/"Formula/.gitignore").read.split rescue []
 
     tapd.find_formula do |pn|
       bn = pn.basename.to_s
-      pn = HOMEBREW_REPOSITORY/"Library/Formula"/bn
+      pn = HOMEBREW_LIBRARY/"Formula/#{bn}"
       pn.delete if pn.symlink? and pn.realpath.to_s =~ %r[^#{tapd.realpath}]
       gitignores.delete(bn)
     end
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 573b199e3e..a8e0389ec1 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -49,6 +49,7 @@ end
 
 HOMEBREW_PREFIX = Pathname.new(HOMEBREW_BREW_FILE).dirname.parent # Where we link under
 HOMEBREW_REPOSITORY = Pathname.new(HOMEBREW_BREW_FILE).realpath.dirname.parent # Where .git is found
+HOMEBREW_LIBRARY = HOMEBREW_REPOSITORY/"Library"
 
 # Where we store built products; /usr/local/Cellar if it exists,
 # otherwise a Cellar relative to the Repository.
@@ -60,7 +61,6 @@ end
 
 HOMEBREW_LOGS = Pathname.new('~/Library/Logs/Homebrew/').expand_path
 
-
 MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp
 MACOS_VERSION = /(10\.\d+)(\.\d+)?/.match(MACOS_FULL_VERSION).captures.first.to_f