diff --git a/tool/rbuninstall.rb b/tool/rbuninstall.rb
index 736213f4fb..2a16b8fe43 100755
--- a/tool/rbuninstall.rb
+++ b/tool/rbuninstall.rb
@@ -46,6 +46,7 @@ END {
     unlink[dir] = true
   end
   while dir = $dirs.pop
+    dir = File.dirname(dir) while File.basename(dir) == '.'
     print "rmdir #{dir}#{ors}"
     unless $dryrun
       begin