diff --git a/core-plugin/README.adoc b/core-plugin/README.adoc
index adb4fe7..8fb756f 100644
--- a/core-plugin/README.adoc
+++ b/core-plugin/README.adoc
@@ -63,7 +63,7 @@ gemResolverStrategy {
   excludeConfigurations 'foo', 'bar'  // <1>
   excludeModule 'foo.*' // <2>
   excludeModule 'foo.*', /1\.2.*/ // <3>
-  useGemVersionResolver 'gems2'
+  useGemVersionResolver 'gems2' // <4>
 }
 ----
 <1> Exclude configurations `foo` and `bar` from being considered for GEM resolver strategies.
diff --git a/docs/_config/site.yml b/docs/_config/site.yml
index 7cdd4db..7dc2e9a 100644
--- a/docs/_config/site.yml
+++ b/docs/_config/site.yml
@@ -1,7 +1,7 @@
 base_url: http://jruby-gradle.org/
 local_tz: UTC
-haml:
-  :ugly: true
+generation:
+  :in_threads: 0
 asciidoctor:
   :safe: unsafe
   :base_dir: null
diff --git a/docs/build.gradle b/docs/build.gradle
index 69bb5ab..86e3f28 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         /* wow. so recursion */
-        classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.1.1"
+        classpath "com.github.jruby-gradle:jruby-gradle-plugin:2.1.0-alpha.2"
     }
 }
 apply plugin: 'groovy'
@@ -18,14 +18,18 @@ configurations {
     asciidoctor
 }
 
-dependencies {
-    asciidoctor('rubygems:awestruct:0.5.5')
-    asciidoctor('rubygems:coderay:1.1.0')
+repositories {
+    ruby.gems()
+}
 
-    /* later versions of 1.6.x have a dependency incompatibility with
-     * mime-types 2.x
-     */
-    asciidoctor('rubygems:rest-client:1.6.7') { force = true }
+dependencies {
+    asciidoctor('rubygems:awestruct:0.6.6')
+    asciidoctor('rubygems:coderay:1.1.3')
+    asciidoctor('rubygems:http_parser.rb:0.6.0')
+    asciidoctor('rubygems:public_suffix:4.0.7')
+    asciidoctor('rubygems:spoon:0.0.6')
+    asciidoctor('rubygems:htmlcompressor:0.4.0')
+    asciidoctor('rubygems:uglifier:4.2.0')
 }
 
 task prepareGroovyDocs(type: Copy) {
diff --git a/docs/plugins/storm.adoc b/docs/plugins/storm.adoc
index 28cab2e..0105aaf 100644
--- a/docs/plugins/storm.adoc
+++ b/docs/plugins/storm.adoc
@@ -16,7 +16,7 @@ documentation intends only to cover the JRuby Gradle plugin's functionality.
 [source,gradle]
 .build.gradle
 ----
-include::../examples/basic-topology.gradle[]
+include::examples/basic-topology.gradle[]
 ----
 
 
diff --git a/examples/run-ruby-binscript/build.gradle b/examples/run-ruby-binscript/build.gradle
index 046b84c..1d98585 100644
--- a/examples/run-ruby-binscript/build.gradle
+++ b/examples/run-ruby-binscript/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     /* Using the built-in `gems` configuration to describe the
      * dependencies our JRubyExec-based tasks will need.
      */
-    gems "rubygems:asciidoctor:1.5.2+"
+    gems "rubygems:asciidoctor:2.0.20+"
 }
 
 task verifyAsciidoctorWorks(type: JRubyExec) {