diff --git a/auxdir/Makefile.am b/auxdir/Makefile.am
index e493002488521afe78ab57bfe32dcbf8ca935cd9..54a67d2861939c93380d06ed8bcc7c92f321a677 100644
--- a/auxdir/Makefile.am
+++ b/auxdir/Makefile.am
@@ -5,7 +5,7 @@
 ##****************************************************************************
 
 EXTRA_DIST = \
-    acx_pthread.m4 \
+    ax_pthread.m4 \
     slurm.m4 \
     test-driver \
     type_socklen_t.m4 \
@@ -37,6 +37,5 @@ EXTRA_DIST = \
     x_ac_setproctitle.m4 \
     x_ac_sgi_job.m4 \
     x_ac_slurm_ssl.m4 \
-    x_ac_srun.m4 \
     x_ac_sun_const.m4 \
     x_ac_xcpu.m4
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 69c63957063eb20bba1035aa12dd0b5de75f2daf..80b49c2f6bb2a65b72e2810f8a79d946695111ed 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -386,7 +386,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = \
-    acx_pthread.m4 \
+    ax_pthread.m4 \
     slurm.m4 \
     test-driver \
     type_socklen_t.m4 \
@@ -418,7 +418,6 @@ EXTRA_DIST = \
     x_ac_setproctitle.m4 \
     x_ac_sgi_job.m4 \
     x_ac_slurm_ssl.m4 \
-    x_ac_srun.m4 \
     x_ac_sun_const.m4 \
     x_ac_xcpu.m4
 
diff --git a/contribs/Makefile.am b/contribs/Makefile.am
index 0c6d0287d506970e7e821f7c721c31f28befa4db..a2640c7e2b8544d82811a4bc13a119b30a80b60a 100644
--- a/contribs/Makefile.am
+++ b/contribs/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2
+SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2 mic phpext
 
 EXTRA_DIST = \
 	env_cache_builder.c	\
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index b9fedf0e8dd8998bedb232bb7db27833b98a81cc..4bd2849d67fffd9affcd10cfb70f56a16c567ad9 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -444,7 +444,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2
+SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2 mic phpext
 EXTRA_DIST = \
 	env_cache_builder.c	\
 	make-3.81.slurm.patch	\