diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
index c4aa7fa4a271..e31ce69baa1f 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
@@ -2,9 +2,13 @@
 , bundlerApp
 , bundlerUpdateScript
 , makeWrapper
+, withJava ? true, jre # Used by asciidoctor-diagram for ditaa and PlantUML
 }:
 
-bundlerApp {
+let
+  path = lib.makeBinPath (lib.optional withJava jre);
+in
+bundlerApp rec {
   pname = "asciidoctor";
   gemdir = ./.;
 
@@ -16,6 +20,13 @@ bundlerApp {
     "asciidoctor-revealjs"
   ];
 
+  buildInputs = [ makeWrapper ];
+
+  postBuild = lib.optionalString (path != "") (lib.concatMapStrings (exe: ''
+    wrapProgram $out/bin/${exe} \
+      --prefix PATH : ${path}
+  '') exes);
+
   passthru = {
     updateScript = bundlerUpdateScript "asciidoctor-with-extensions";
   };