diff --git a/Rakefile b/Rakefile
index 0a0f259..2bec1b8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,3 +21,10 @@ begin
   end
 end
 task :test => defaults
+
+task :docs do
+  require 'puppet-strings'
+  # Remove TOC, as YARD generates its own
+  sh "sed -i '/# aegir/,/## Description/{//!d}' README.md"
+  PuppetStrings.generate(PuppetStrings::DEFAULT_SEARCH_PATTERNS, { :yard_args => ['--output-dir=public'] })
+end