diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 8330c650f2..f724a068ed 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -80,9 +80,13 @@ class Keg
   end
 
   def rm
+    # don't rmtree shit if we aren't positive about our location!
+    raise "Bad stuff!" unless path.parent.parent == $cellar
+
     if path.directory?
       FileUtils.chmod_R 0777, path # ensure we have permission to delete
-      path.rmtree
+      path.rmtree # $cellar/foo/1.2.0
+      path.parent.rmdir if path.parent.children.length == 0 # $cellar/foo
     end
   end