diff --git a/ompi/dynamic-mca/Makefile.am b/ompi/dynamic-mca/Makefile.am
index 21d0137b49..c723ec95bf 100644
--- a/ompi/dynamic-mca/Makefile.am
+++ b/ompi/dynamic-mca/Makefile.am
@@ -17,10 +17,12 @@
 include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS = \
+        allocator \
         common \
         btl \
         coll \
         io \
+        mpool \
         pml \
         ptl \
         topo
diff --git a/opal/dynamic-mca/allocator/Makefile.am b/ompi/dynamic-mca/allocator/Makefile.am
similarity index 100%
rename from opal/dynamic-mca/allocator/Makefile.am
rename to ompi/dynamic-mca/allocator/Makefile.am
diff --git a/opal/dynamic-mca/mpool/Makefile.am b/ompi/dynamic-mca/mpool/Makefile.am
similarity index 100%
rename from opal/dynamic-mca/mpool/Makefile.am
rename to ompi/dynamic-mca/mpool/Makefile.am
diff --git a/opal/dynamic-mca/Makefile.am b/opal/dynamic-mca/Makefile.am
deleted file mode 100644
index 94d257989e..0000000000
--- a/opal/dynamic-mca/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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 = \
-        allocator \
-        mpool