diff --git a/build.gradle.kts b/build.gradle.kts
index 465b527..644a21d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -283,6 +283,7 @@
         val dst = imageDir.file(key)
         val src = imageDir.file(generatedImages[key])
         tasks.register<Exec>("images.${key}") {
+            val cropped = imageDir.file(key.replace(".pdf", "-crop.pdf"))
             // set working directory to imageDir so that relative includes work
             workingDir(imageDir)
             inputs.files(src)
@@ -291,7 +292,7 @@
             commandLine(
                 "bash",
                 "-c",
-                "plantuml -tsvg -pipe < ${src} | rsvg-convert --format pdf > ${dst}"
+                "plantuml -tsvg -pipe < ${src} | rsvg-convert --format pdf > ${dst} && pdfcrop ${dst} ${cropped} && mv -f ${cropped} ${dst}"
             )
             description = "Generate ${key} from ${generatedImages[key]}."
         }
@@ -310,12 +311,13 @@
         val dst = imageDir.file(key)
         val src = imageDir.file(generatedImages[key])
         tasks.register<Exec>("images.${key}") {
+            val cropped = imageDir.file(key.replace(".pdf", "-crop.pdf"))
             inputs.files(src)
             outputs.files(dst)
             commandLine(
                 "bash",
                 "-c",
-                "inkscape --export-area-drawing --export-text-to-path --export-type=pdf --export-filename=${dst} ${src}"
+                "rsvg-convert --format pdf ${src} > ${dst} && pdfcrop ${dst} ${cropped} && mv -f ${cropped} ${dst}"
             )
             description = "Generate ${key} from ${generatedImages[key]}."
         }