diff --git a/Make.mk b/Make.mk
index 3adb4fbf..26e814c7 100644
--- a/Make.mk
+++ b/Make.mk
@@ -235,7 +235,9 @@ endif
 
 
 info.nr/%: info/%.t
-	(cd $(srcdir)/info && $(NROFF) CRT.MAC $(notdir $< )) | $(AWK) -f $(filter %/Blank.awk, $^) >$@
+	$(NROFF) $(filter %.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@
+# Pipes in make are a pain.  Catch obvious errors:
+	@test -s $@
 
 info.html/%.html: info/%.t
 	perl $(filter %.pl, $^) $< >$@
diff --git a/info/CRT.MAC b/info/CRT.MAC
index 5aead35b..db6ed1b3 100644
--- a/info/CRT.MAC
+++ b/info/CRT.MAC
@@ -30,4 +30,5 @@
 .ev 2
 .ll 7.8i        \" Line length: 7.8 inches
 .ev
-.so INFO.MAC \" Read in INFO.MAC macros
+\" .so INFO.MAC \" Read in INFO.MAC macros
+\" except that's done by make now