diff --git a/Makefile.am b/Makefile.am
index ac053fdf14..e94094a771 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 #
 
 SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
-EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE
+EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.sh
 
 include examples/Makefile.include
 
diff --git a/config/Makefile.am b/config/Makefile.am
index 36ba1e06fa..b318592b96 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -19,45 +19,11 @@
 
 EXTRA_DIST = \
         distscript.csh \
-        c_get_alignment.m4 \
-        c_weak_symbols.m4 \
-        cxx_find_template_parameters.m4 \
-        cxx_find_template_repository.m4 \
-        cxx_find_exception_flags.m4 \
-        cxx_have_exceptions.m4 \
-        f77_check_type.m4 \
-        f77_find_ext_symbol_convention.m4 \
-        f77_get_alignment.m4 \
-        f77_get_sizeof.m4 \
-        f90_check_type.m4 \
-        f90_find_module_include_flag.m4 \
-        f90_get_precision.m4 \
-        f90_get_range.m4 \
-        f90_get_sizeof.m4 \
-        mca_acinclude.m4 \
-        mca_configure.ac \
-        mca_make_configure.pl \
-        mca_no_configure_components.m4 \
-        ompi_case_sensitive_fs_setup.m4 \
-        ompi_check_optflags.m4 \
-        ompi_check_pthread_pids.m4 \
-        ompi_config_subdir.m4 \
-        ompi_config_subdir_args.m4 \
-        ompi_config_pthreads.m4 \
-        ompi_config_solaris_threads.m4 \
-        ompi_config_threads.m4 \
-        ompi_configure_options.m4 \
-        ompi_contrib.m4 \
-        ompi_functions.m4 \
-        ompi_get_version.m4 \
-        ompi_get_version.m4sh \
-        ompi_get_version.sh \
-        ompi_make_stripped_flags.m4 \
-        ompi_mca.m4 \
-        ompi_setup_cc.m4 \
-        ompi_setup_cxx.m4 \
-        ompi_setup_f77.m4 \
-        ompi_setup_f90.m4
+	ompi_get_version.m4sh \
+	libltdl_dlopen_global.diff \
+	lt1522-pathCC.diff \
+	lt21a-pathCC.diff \
+	ltmain_otool.diff
 
 maintainer-clean-local:
 	rm -f ompi_get_version.sh
diff --git a/config/distscript.csh b/config/distscript.csh
index e57bec0d6a..77af4c19d6 100755
--- a/config/distscript.csh
+++ b/config/distscript.csh
@@ -76,6 +76,14 @@ else
     echo "*** Did NOT updated VERSION file with SVN r number"
 endif
 
+# Copy configure.params and autogen.subdirs files into distribution.
+# This should really be in each component's Makefile.am, but that's
+# never going to happen.  So copy here automagically.
+echo "*** Copying configure.params files"
+find opal orte ompi -name "configure.params" -exec cp -f -p "{}" "$distdir/{}" \; >& /dev/null
+echo "*** Copying autogen.subdirs files"
+find opal orte ompi -name "autogen.subdirs" -exec cp -f -p "{}" "$distdir/{}" \; >& /dev/null
+
 #########################################################
 # VERY IMPORTANT: Now go into the new distribution tree #
 #########################################################
@@ -202,7 +210,6 @@ set ver="$OMPI_VERSION"
 #end
 #cd ../..
 
-
 #
 # Put the release version number in the README and INSTALL files
 #
diff --git a/ompi/mca/io/romio/romio/configure.in b/ompi/mca/io/romio/romio/configure.in
index 539d11385b..c6e6fc456e 100644
--- a/ompi/mca/io/romio/romio/configure.in
+++ b/ompi/mca/io/romio/romio/configure.in
@@ -37,7 +37,7 @@ AC_DEFINE([HAVE_MPI_OFFSET], [1], [Will always be 1 - OMPI has MPI_OFFSET])
 			   
 # Open MPI: look for top Open MPI directory
 AC_MSG_CHECKING([for Open MPI support files])
-if test -f "$srcdir/../../../../../config/mca_configure.ac"; then
+if test -f "$srcdir/../../../../../config/ompi_mca.m4"; then
 
     # This is needed for VPATH builds, so that it will -I the
     # appropriate include directory (don't know why automake