diff --git a/configure.ac b/configure.ac
index 03ba835795..dbc604858c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,8 +152,9 @@ AM_ENABLE_SHARED
 AM_DISABLE_STATIC
 
 WRAPPER_EXTRA_CFLAGS=
-WRAPPER_EXTRA_FFLAGS=
 WRAPPER_EXTRA_CXXFLAGS=
+WRAPPER_EXTRA_FFLAGS=
+WRAPPER_EXTRA_FCFLAGS=
 WRAPPER_EXTRA_LDFLAGS=
 WRAPPER_EXTRA_LIBS=
 
@@ -1547,6 +1548,7 @@ AC_CONFIG_FILES([
 
     src/dynamic-mca/Makefile
     src/dynamic-mca/allocator/Makefile
+    src/dynamic-mca/bmi/Makefile
     src/dynamic-mca/coll/Makefile
     src/dynamic-mca/io/Makefile
     src/dynamic-mca/mpool/Makefile
diff --git a/src/dynamic-mca/bmi/Makefile.am b/src/dynamic-mca/bmi/Makefile.am
new file mode 100644
index 0000000000..f4b74048f0
--- /dev/null
+++ b/src/dynamic-mca/bmi/Makefile.am
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+SUBDIRS			= $(MCA_bmi_DSO_SUBDIRS)
+DISTCLEANFILES		= $(SUBDIRS)
+
+# Every directory under here is a sym link to something in the main
+# src/mca tree.  Hence, we don't want to distribute anything under
+# here.
+
+DIST_SUBDIRS		=