diff --git a/make-includes/standard_rules.make b/make-includes/standard_rules.make
index b318821..e2f2c15 100644
--- a/make-includes/standard_rules.make
+++ b/make-includes/standard_rules.make
@@ -236,24 +236,24 @@
 # PDFs (previously it over-cropped slightly).
 #
 %.pdf %-print.pdf: %.svg
-	$(INKSCAPE) --file=$< --without-gui --export-area-drawing --export-text-to-path --export-pdf=$(IMGDIR)/$@
+	$(INKSCAPE) --export-area-drawing --export-text-to-path --export-type=pdf --export-filename=$(IMGDIR)/$@ $<
 #
 # PNG from SVG (via Inkscape)
 #
 %.png %-print.png %-web.png: %.svg
-	$(INKSCAPE) --file=$< --without-gui --export-area-drawing --export-background-opacity=1.0 --export-dpi=96 --export-png=$(IMGDIR)/$@
+	$(INKSCAPE) --export-area-drawing --export-background-opacity=1.0 --export-dpi=96 --export-type=png --export-filename=$(IMGDIR)/$@ $<
 
 %-web-zoom.png: %.svg
-	$(INKSCAPE) --file=$< --without-gui --export-area-drawing --export-background-opacity=1.0 --export-dpi=144 --export-png=$(IMGDIR)/$@
+	$(INKSCAPE) --export-area-drawing --export-background-opacity=1.0 --export-dpi=144 --export-type=png --export-filename=$(IMGDIR)/$@ $<
 
 %-print-zoom.png: %.svg
-	$(INKSCAPE) --file=$< --without-gui --export-area-drawing --export-background-opacity=1.0 --export-dpi=300 --export-png=$(IMGDIR)/$@
+	$(INKSCAPE) --export-area-drawing --export-background-opacity=1.0 --export-dpi=300 --export-type=png --export-filename=$(IMGDIR)/$@ $<
 
 %-print-zoom-transparent.png: %.svg
-	$(INKSCAPE) --file=$< --without-gui --export-area-drawing --export-background-opacity=0 --export-dpi=300 --export-png=$(IMGDIR)/$@
+	$(INKSCAPE) --export-area-drawing --export-background-opacity=0 --export-dpi=300 --export-type=png --export-filename=$(IMGDIR)/$@ $<
 
 %-transparent.png: %.svg
-	$(INKSCAPE) --file=$< --without-gui --export-area-drawing --export-background-opacity=0 --export-dpi=96 --export-png=$(IMGDIR)/$@
+	$(INKSCAPE) --export-area-drawing --export-background-opacity=0 --export-dpi=96 --export-type=png --export-filename=$(IMGDIR)/$@ $<
 #
 # PNG from PNG (change the name).
 # These appear to need to be separate rules. If both variants need to be
@@ -295,5 +295,4 @@
 # Direct PDF from PlantUML is problematic, go via SVG instead.
 #
 %.pdf: %.pu
-	$(PLANTUML) -tsvg -pipe < $< > $(TEMPDIR)/$*.svg
-	$(INKSCAPE) --file=$(TEMPDIR)/$*.svg --without-gui --export-area-drawing --export-text-to-path --export-pdf=$(IMGDIR)/$@
+	$(PLANTUML) -tsvg -pipe < $< | $(INKSCAPE) --pipe --export-area-drawing --export-text-to-path --export-type=pdf --export-filename=$(IMGDIR)/$@