diff --git a/Library/Homebrew/caveats.rb b/Library/Homebrew/caveats.rb
index 2e1813b832..cd03952ee2 100644
--- a/Library/Homebrew/caveats.rb
+++ b/Library/Homebrew/caveats.rb
@@ -92,11 +92,11 @@ class Caveats
         if f.plist_startup
           s << "To have launchd start #{f.name} at startup:"
           s << "    sudo mkdir -p #{destination}" unless destination_path.directory?
-          s << "    sudo cp -fv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
+          s << "    sudo cp -fv #{f.opt_prefix}/*.plist #{destination}"
         else
           s << "To have launchd start #{f.name} at login:"
           s << "    mkdir -p #{destination}" unless destination_path.directory?
-          s << "    ln -sfv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
+          s << "    ln -sfv #{f.opt_prefix}/*.plist #{destination}"
         end
         s << "Then to load #{f.name} now:"
         if f.plist_startup
@@ -112,7 +112,7 @@ class Caveats
         s << "To reload #{f.name} after an upgrade:"
         if f.plist_startup
           s << "    sudo launchctl unload #{plist_link}"
-          s << "    sudo cp -fv #{HOMEBREW_PREFIX}/opt/#{f.name}/*.plist #{destination}"
+          s << "    sudo cp -fv #{f.opt_prefix}/*.plist #{destination}"
           s << "    sudo launchctl load #{plist_link}"
         else
           s << "    launchctl unload #{plist_link}"
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index d07fea7598..4d929de988 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -727,8 +727,8 @@ class Formula
         build variables:
 
         EOS
-      s << "    LDFLAGS:  -L#{HOMEBREW_PREFIX}/opt/#{name}/lib\n" if lib.directory?
-      s << "    CPPFLAGS: -I#{HOMEBREW_PREFIX}/opt/#{name}/include\n" if include.directory?
+      s << "    LDFLAGS:  -L#{opt_lib}\n" if lib.directory?
+      s << "    CPPFLAGS: -I#{opt_include}\n" if include.directory?
     end
     s << "\n"
   end