diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index 4ca2d85319..3f7e07d963 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -60,11 +60,11 @@ module Homebrew extend self
 
   def list_versions
     if ARGV.named.empty?
-      HOMEBREW_CELLAR.children.select{ |pn| pn.directory? }
+      HOMEBREW_CELLAR.subdirs
     else
       ARGV.named.map{ |n| HOMEBREW_CELLAR+n }.select{ |pn| pn.exist? }
     end.each do |d|
-      versions = d.children.select{ |pn| pn.directory? }.map{ |pn| pn.basename.to_s }
+      versions = d.subdirs.map { |pn| pn.basename.to_s }
       next if ARGV.include?('--multiple') && versions.count < 2
       puts "#{d.basename} #{versions*' '}"
     end
@@ -72,7 +72,7 @@ module Homebrew extend self
 
   def list_pinned
     if ARGV.named.empty?
-      HOMEBREW_CELLAR.children.select{ |pn| pn.directory? }
+      HOMEBREW_CELLAR.subdirs
     else
       ARGV.named.map{ |n| HOMEBREW_CELLAR+n }.select{ |pn| pn.exist? }
     end.select do |d|