diff --git a/build.gradle.kts b/build.gradle.kts
index 3f02c80..465b527 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -287,13 +287,11 @@
             workingDir(imageDir)
             inputs.files(src)
             outputs.files(dst)
-            // JAVA_TOOL_OPTIONS stops Java from stealing focus on macOS.
-            environment("JAVA_TOOL_OPTIONS", "-Djava.awt.headless=true")
             // Direct PDF from PlantUML is problematic, go via SVG instead.
             commandLine(
                 "bash",
                 "-c",
-                "plantuml -tsvg -pipe < ${src} | inkscape --pipe --export-area-drawing --export-text-to-path --export-type=pdf --export-filename=${dst}"
+                "plantuml -tsvg -pipe < ${src} | rsvg-convert --format pdf > ${dst}"
             )
             description = "Generate ${key} from ${generatedImages[key]}."
         }