3 files changed, 2 insertions, 1 deletions

diff --git a/Makefile.in b/Makefile.in
index 6e72136c5..acfb919da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -187,7 +187,7 @@ $(SSHOBJS): Makefile.in config.h
 $(SSHDOBJS): Makefile.in config.h
 configure-check: $(srcdir)/configure
 
-$(srcdir)/configure: configure.ac aclocal.m4
+$(srcdir)/configure: configure.ac $(srcdir)/m4/*.m4
         @echo "ERROR: configure is out of date; please run ${AUTORECONF} (and configure)" 1>&2
         @exit 1
 
diff --git a/configure.ac b/configure.ac
index 9ae199bc7..28947a660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
diff --git a/aclocal.m4 b/m4/openssh.m4
index b70856e43..b70856e43 100644
--- a/aclocal.m4
+++ b/m4/openssh.m4