diff --git a/lib/yard.rb b/lib/yard.rb
index fa7667826..28cde5b09 100644
--- a/lib/yard.rb
+++ b/lib/yard.rb
@@ -11,7 +11,7 @@ def self.parse_string(*args) Parser::SourceParser.parse_string(*args) end
   # 
   # @return [true] always returns true
   def self.load_plugins
-    Gem.source_index.all_gems.values.each do |gem|
+    Gem.source_index.entries.each do |pkgname, gem|
       begin
         if gem.name =~ /^yard[-_]/
           log.debug "Loading plugin '#{gem.name}'..."
diff --git a/spec/yard_spec.rb b/spec/yard_spec.rb
index 0579443dd..affaac89c 100644
--- a/spec/yard_spec.rb
+++ b/spec/yard_spec.rb
@@ -14,7 +14,7 @@
         v.should_receive(:name).at_least(1).times.and_return(k)
       end
       source_mock = mock(:source_index)
-      source_mock.should_receive(:all_gems).and_return(plugins)
+      source_mock.should_receive(:entries).and_return(plugins)
       Gem.should_receive(:source_index).and_return(source_mock)
       YARD.should_receive(:require).with('yard_plugin').and_return(true)
       YARD.should_receive(:require).with('yard-plugin').and_return(true)