diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 9f981f1168..ef45617849 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -160,7 +160,7 @@ def prune
   $d=0
 
   dirs=Array.new
-  paths=%w[bin etc lib include share].collect {|d| HOMEBREW_PREFIX+d}
+  paths=%w[bin sbin etc lib include share].collect {|d| HOMEBREW_PREFIX+d}
 
   paths.each do |path|
     path.find do |path|
@@ -213,7 +213,7 @@ class Cleaner
     share=f.prefix+'share'
     (f.prefix+'man').mv share rescue nil
     
-    [f.bin, f.lib].each {|d| clean_dir d}
+    [f.bin, f.sbin, f.lib].each {|d| clean_dir d}
     
     # you can read all of this shit online nowadays, save the space
     # info pages are shit, everyone agrees apart from Richard Stallman
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 3ba29563e3..c0cb925a2a 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -63,6 +63,7 @@ class AbstractFormula
   attr_reader :url, :version, :url, :homepage, :name
 
   def bin; prefix+'bin' end
+  def sbin; prefix+'sbin' end
   def doc; prefix+'share'+'doc'+name end
   def lib; prefix+'lib' end
   def man; prefix+'share'+'man' end
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index a2ef1701cc..7810628414 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -38,6 +38,7 @@ class Keg <Pathname
     # these dirs REMEMBER that *NOT* everything needs to be in the main tree
     link_dir('etc') {:mkpath}
     link_dir('bin') {:link}
+    link_dir('sbin') {:link}
     link_dir('lib') {|path| :mkpath if %w[pkgconfig php perl5].include? path.to_s}
     link_dir('include') {:link}
     link_dir('share') {|path| :mkpath if mkpaths.include? path.to_s}