diff --git a/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy b/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy
index 7b3c4d79583..2833e678ff6 100644
--- a/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy
+++ b/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy
@@ -2,8 +2,8 @@ package grails.doc.asciidoc
 
 import grails.doc.DocEngine
 import groovy.transform.InheritConstructors
+import org.asciidoctor.Attributes
 import org.asciidoctor.Options
-import org.asciidoctor.OptionsBuilder
 import org.asciidoctor.SafeMode
 import org.radeox.api.engine.context.RenderContext
 
@@ -25,16 +25,16 @@ class AsciiDocEngine extends DocEngine {
     ]
     @Override
     String render(String content, RenderContext context) {
-        def optionsBuilder = OptionsBuilder.options()
-                                        .headerFooter(false)
-                                        .attributes(attributes)
-        if(attributes.containsKey('safe')) {
+        def optionsBuilder = Options.builder()
+            .standalone(false)
+            .attributes(Attributes.builder()
+                .imagesDir(attributes['imagesdir'])
+                .sourceHighlighter(attributes[ 'source-highlighter'])
+                .icons('icons').build())
+
+        if (attributes.containsKey('safe')) {
             optionsBuilder.safe(SafeMode.valueOf(attributes.get('safe').toString()))
         }
-        asciidoctor.convert(content,
-            optionsBuilder
-                .get()
-        )
+        asciidoctor.convert(content, optionsBuilder.build())
     }
-
 }