diff --git a/Makefile.am b/Makefile.am
index 9952569c1..fb228694c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST = \
     version.sh
 
 include $(srcdir)/src/Makemodule.am
+include $(srcdir)/src/Makemodule-local.am # Optional project-local hook
 
 ################################################################################
 #  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
diff --git a/autogen.sh b/autogen.sh
index 7806825a1..f246ea589 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,8 +31,9 @@ if [ $? -ne 0 ]; then
 fi
 
 autoreconf --install --force --verbose -I config
-if [ $? -ne 0 ]; then
-    echo "autogen.sh: error: autoreconf exited with status $?" 1>&2
+status=$?
+if [ $status -ne 0 ]; then
+    echo "autogen.sh: error: autoreconf exited with status $status" 1>&2
     exit 1
 fi