diff --git a/lib/puppet/face/yardoc.rb b/lib/puppet/face/yardoc.rb
index 329e152..7b59c99 100644
--- a/lib/puppet/face/yardoc.rb
+++ b/lib/puppet/face/yardoc.rb
@@ -17,10 +17,8 @@ Puppet::Face.define(:yardoc, '0.0.1') do
 
       require 'puppetx/yardoc/yard/plugin'
 
-      parser = Puppetx::Yardoc::YARD::PuppetParser.new(File.read(manifest), manifest)
-      parser.parse
-
-      return parser.enumerator.map {|s| s.comments}
+      # Hand off to YARD for further processing.
+      YARD::CLI::Yardoc.run(manifest)
     end
   end
 end