--- a/contrib/chg/chg.c	Sun Apr 09 19:09:07 2017 +0200
+++ b/contrib/chg/chg.c	Tue Apr 11 18:31:40 2017 -0700
@@ -447,11 +447,11 @@
 	}
 
 	setupsignalhandler(hgc_peerpid(hgc), hgc_peerpgid(hgc));
+	atexit(waitpager);
 	int exitcode = hgc_runcommand(hgc, argv + 1, argc - 1);
 	restoresignalhandler();
 	hgc_close(hgc);
 	freecmdserveropts(&opts);
-	waitpager();
 
 	return exitcode;
 }