@@ -58,13 +58,11 @@ def index_latest
   end
 
   def index_recipes
-    all_cookbooks = Array(Chef::CookbookVersion.cdb_list_latest(true))
-    all_cookbooks.map! do |cookbook|
-      cookbook.manifest["recipes"].map { |r| "#{cookbook.name}::#{File.basename(r['name'], ".rb")}" }
+    display Chef::CookbookVersion.cdb_list(true).inject({}) do |memo, f| 
+      memo[f.name] ||= {}
+      memo[f.name][f.version] = f.recipe_filenames_by_name.keys
+      memo
     end
-    all_cookbooks.flatten!
-    all_cookbooks.sort!
-    display all_cookbooks
   end
 
   def show_versions
 
@@ -231,12 +231,9 @@ def determine_name(type, object)
   def get_available_recipes
     r = Chef::REST.new(Chef::Config[:chef_server_url])
     all_recipes = Array.new
-    r.get_rest('cookbooks').keys.each do |cb|
-      all_recipes << r.get_rest("cookbooks/#{cb}")[cb].sort!{|x,y| y <=> x }.map do |ver|
-        r.get_rest("cookbooks/#{cb}/#{ver}").recipe_filenames.map do |rec| 
-          rn = File.basename(rec, ".rb")
-          rn == "default" ? "#{cb} #{ver}" : "#{cb}::#{rn} #{ver}"
-        end
+    r.get_rest('cookbooks/_recipes').keys.each do |cb|
+      all_recipes << all[cb].sort{|x,y| y <=> x }.map do |ver, recipes|
+        recipes.map{ |rn| rn == "default" ? "#{cb} #{ver}" : "#{cb}::#{rn} #{ver}" }
       end
     end
     all_recipes.flatten.uniq
 
@@ -23,6 +23,7 @@ class Chef::Knife::RecipeList < Chef::Knife
 
   def run
     recipes = rest.get_rest('cookbooks/_recipes')
+    recipes = recipes.keys.map { |cb| recipes[cb].map {|ver, rec| rec.map{ |rn| "#{cb}::#{rn} (#{ver})" }}}.flatten.uniq
     if pattern = @name_args.first
       recipes = recipes.grep(Regexp.new(pattern))
     end