diff --git a/make-includes/standard_rules.make b/make-includes/standard_rules.make
index 3a48823..4db7a8c 100644
--- a/make-includes/standard_rules.make
+++ b/make-includes/standard_rules.make
@@ -275,12 +275,11 @@
 # SVG, PNG, TeX from PlantUML
 #
 %.svg: %.pu
-	$(PLANTUML) -tsvg -output $(IMGDIR) $<
+	$(PLANTUML) -tsvg -pipe < $< > $(IMGDIR)/$@
 %.png: %.pu
-	$(PLANTUML) -tpng -output $(IMGDIR) $<
+	$(PLANTUML) -tpng -pipe < $< > $(IMGDIR)/$@
 %.tex: %.pu
-	$(PLANTUML) -tlatex:nopreamble -output $(IMGDIR) $<
-	$(MV) $(IMGDIR)/$*.latex $(IMGDIR)/$@
+	$(PLANTUML) -tlatex:nopreamble -pipe < $< > $(IMGDIR)/$@
 #
 # PDF from PlantUML
 # Direct PDF from PlantUML is problematic, go via SVG instead.