diff --git a/Makerules b/Makerules
index d2efcd191c41ed6ac934d46a6c26f4195a76fceb..18f5149f7741a65ef3f98fe35a820b4222af5075 100644
--- a/Makerules
+++ b/Makerules
@@ -109,14 +109,11 @@ pics: $(addsuffix .pdf, $(PICS))
 %.pdf: %.asy $(TOP)/pics/ads.asy $(TEXFMTPATH)
 	PATH=$(TOP)/pics:$(PATH) asy -f pdf -tex pdftex $<
 
-%-booklet.pdf: %-uncompressed.pdf
-	pspdftool 'book nup(2,paper=a4)' $< $@
+%-booklet.pdf: %.pdf
+	paperjam 'book nup(2,paper=a4)' $< $@
 
-%-2in1.pdf: %-uncompressed.pdf
-	pspdftool 'nup(2,paper=a4)' $< $@
-
-%-uncompressed.pdf: %.pdf
-	qpdf --object-streams=disable --stream-data=uncompress $< $@
+%-2in1.pdf: %.pdf
+	paperjam 'nup(2,paper=a4)' $< $@
 
 $(TEXFMTPATH):
 	@echo 'Generating $@'