2 files changed, 8 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/linkapps.rb b/Library/Homebrew/cmd/linkapps.rb
index 9a58bd37a..dba9beaa5 100644
--- a/Library/Homebrew/cmd/linkapps.rb
+++ b/Library/Homebrew/cmd/linkapps.rb
@@ -23,11 +23,9 @@ module Homebrew
     end
 
     kegs.each do |keg|
-      keg = keg.opt_record if keg.optlinked?
-      Dir["#{keg}/*.app", "#{keg}/bin/*.app", "#{keg}/libexec/*.app"].each do |app|
+      keg.apps.each do |app|
         puts "Linking #{app} to #{target_dir}."
-        app_name = File.basename(app)
-        target = "#{target_dir}/#{app_name}"
+        target = "#{target_dir}/#{app.basename}"
 
         if File.exist?(target) && !File.symlink?(target)
           onoe "#{target} already exists, skipping."
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 1d0361983..9b548b83a 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -253,8 +253,13 @@ class Keg
     Dir["#{path}/lib/python2.7/site-packages/*.pth"].any?
   end
 
+  def apps
+    app_prefix = optlinked? ? opt_record : path
+    Pathname.glob("#{app_prefix}/{,libexec/}*.app")
+  end
+
   def app_installed?
-    Dir["#{path}/{,libexec/}*.app"].any?
+    !apps.empty?
   end
 
   def elisp_installed?