diff --git a/.gitignore b/.gitignore
index bf922ce74..26bdf52d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ bin
 .classpath
 .settings
 .DS_Store
-hs_err_pid*.log
\ No newline at end of file
+hs_err_pid*.log
+*.bkp
\ No newline at end of file
diff --git a/docs/guide/guide.gradle b/docs/guide/guide.gradle
index c61569ae9..3239f75ae 100644
--- a/docs/guide/guide.gradle
+++ b/docs/guide/guide.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'org.kordamp.gradle.guide'
     id 'org.ajoberstar.git-publish'
+    id 'org.asciidoctor.jvm.pdf'
 }
 
 configurations {
@@ -13,6 +14,9 @@ dependencies {
 
 asciidoctor {
     configurations 'asciidoctorExtensions'
+    outputOptions {
+        backends = ['pdf', 'html5']
+    }
     forkOptions {
       // Fix issue with JDK16+
       jvmArgs("--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED")
@@ -20,9 +24,14 @@ asciidoctor {
     attributes = [
         numbered                : false,
         'source-highlighter'    : 'coderay',
+        'imagesdir'             : 'images/',
         'coderay-linenums-mode' : 'table',
         'testdir'               : '../../../../../plugins/riot/src/test/resources'
     ]
+    doLast {
+      file("$outputDir/pdf/index.pdf").
+              renameTo("$outputDir/pdf/riot-${project.version}.pdf")
+    }
 }
 
 eclipse {
diff --git a/gradle.properties b/gradle.properties
index 6bb97f867..b47705418 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,6 +22,7 @@ testSourceCompatibility     = 17
 testTargetCompatibility     = 17
 reproducibleBuild           = true
 
+asciidoctorPluginVersion    = 3.3.2
 bootPluginVersion           = 3.2.3
 dependencyPluginVersion     = 1.1.4
 gitPluginVersion            = 3.0.0
@@ -37,7 +38,7 @@ latencyutilsVersion         = 2.0.3
 lettucemodVersion           = 3.7.3
 picocliVersion              = 4.7.5
 progressbarVersion          = 0.10.0
-springBatchRedisVersion     = 4.0.4
+springBatchRedisVersion     = 4.0.5
 testcontainersRedisVersion  = 2.2.0
 
 org.gradle.daemon           = false
diff --git a/jreleaser.yml b/jreleaser.yml
index 929e8223c..52684ad68 100644
--- a/jreleaser.yml
+++ b/jreleaser.yml
@@ -262,3 +262,5 @@ files:
         skipChecksum: 'true'
         skipSigning: 'true'
         skipSbom: 'true'
+    - path: docs/guide/build/guide/pdf/{{projectName}}-{{projectVersion}}.pdf
+      transform: '{{projectName}}-{{projectEffectiveVersion}}.pdf'
diff --git a/plugins/riot/riot.gradle b/plugins/riot/riot.gradle
index dfee00771..aae6b446a 100644
--- a/plugins/riot/riot.gradle
+++ b/plugins/riot/riot.gradle
@@ -23,7 +23,7 @@ plugins {
 
 application {
     applicationName = 'riot'
-    mainClass   = 'com.redis.riot.cli.Main'
+    mainClass       = 'com.redis.riot.cli.Main'
 }
 
 bootJar {
diff --git a/settings.gradle b/settings.gradle
index 1d5a2dd1d..2d637eff3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -30,6 +30,7 @@ buildscript {
         classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
         classpath "io.spring.gradle:dependency-management-plugin:$dependencyPluginVersion"
+        classpath "org.asciidoctor:asciidoctor-gradle-jvm-pdf:$asciidoctorPluginVersion"
     }
 }