diff --git a/jekyll-docs/jekyll-docs.gemspec b/jekyll-docs/jekyll-docs.gemspec
index 02c373cc..9751ff52 100644
--- a/jekyll-docs/jekyll-docs.gemspec
+++ b/jekyll-docs/jekyll-docs.gemspec
@@ -1,5 +1,4 @@
 # coding: utf-8
-require File.expand_path('../../lib/jekyll/version', __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'jekyll-docs'
diff --git a/jekyll-docs/lib/jekyll-docs.rb b/jekyll-docs/lib/jekyll-docs.rb
index 76ed922d..df8a9b02 100644
--- a/jekyll-docs/lib/jekyll-docs.rb
+++ b/jekyll-docs/lib/jekyll-docs.rb
@@ -20,13 +20,15 @@ module JekyllDocs
 
       def process(opts)
         Dir.mktmpdir do |dest_dir|
-          Jekyll::Commands::Serve.process(opts.merge({
+          options = opts.merge({
             "serving"     => true,
             "watch"       => false,
             "config"      => File.expand_path("../../site/_config.yml", __FILE__),
-            "source"      => File.expand_path("../../site/", __FILE__),
+            "source"      => File.expand_path("../../site", __FILE__),
             "destination" => dest_dir
-          }))
+          })
+          Jekyll::Commands::Build.process(options)
+          Jekyll::Commands::Serve.process(options)
         end
       end
     end