diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 991ca58b89..f729937f1f 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -32,8 +32,8 @@ module Homebrew extend self
       if tap_dir.directory?
         result = ""
         if query
-          tap_dir.find_formula do |child|
-            basename = child.basename(".rb").to_s
+          tap_dir.find_formula do |file|
+            basename = file.basename(".rb").to_s
             result = basename if basename == query
           end
         end
diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index 0c15b4ac51..15ebacb613 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -25,7 +25,7 @@ module Homebrew extend self
     abort unless system "git clone https://github.com/#{repouser}/homebrew-#{repo} #{tapd}"
 
     files = []
-    tapd.find_formula { |file| files << tapd.join(file) }
+    tapd.find_formula { |file| files << file }
     link_tap_formula(files)
     puts "Tapped #{files.length} formula"
 
@@ -85,7 +85,7 @@ module Homebrew extend self
     # check symlinks are all set in each tap
     each_tap do |user, repo|
       files = []
-      repo.find_formula { |file| files << repo.join(file) }
+      repo.find_formula { |file| files << file }
       count += link_tap_formula(files)
     end
 
diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index bbb2232383..bba10b07a6 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -18,7 +18,7 @@ module Homebrew extend self
     raise "No such tap!" unless tapd.directory?
 
     files = []
-    tapd.find_formula { |file| files << tapd.join(file) }
+    tapd.find_formula { |file| files << file }
     unlink_tap_formula(files)
     tapd.rmtree
     tapd.dirname.rmdir_if_possible
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 9bd1275fdf..c117755073 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -321,8 +321,8 @@ class Pathname
   def find_formula
     [self/:Formula, self/:HomebrewFormula, self].each do |d|
       if d.exist?
-        d.children.map{ |child| child.relative_path_from(self) }.each do |pn|
-          yield pn if pn.to_s =~ /.rb$/
+        d.children.each do |pn|
+          yield pn if pn.extname == ".rb"
         end
         break
       end
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index bde6188d6b..ec4693785a 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -163,9 +163,9 @@ class Formulary
       path = tap.join("#{name}.rb")
 
       if tap.directory?
-        tap.find_formula do |child|
-          if child.basename(".rb").to_s == name
-            path = tap.join(child)
+        tap.find_formula do |file|
+          if file.basename(".rb").to_s == name
+            path = file
           end
         end
       end