diff --git a/configure.ac b/configure.ac
index 7db31089eb..47243e6954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,6 +498,7 @@ AC_CONFIG_FILES([
     src/lam/os/linux/x86_64/Makefile
     src/lam/os/tru64/Makefile
 
+    src/lam/runtime/Makefile
     src/lam/threads/Makefile
     src/lam/util/Makefile
 
@@ -518,6 +519,7 @@ AC_CONFIG_FILES([
     src/mpi/op/Makefile
     src/mpi/proc/Makefile
     src/mpi/request/Makefile
+    src/mpi/runtime/Makefile
 
     src/mca/Makefile
 
diff --git a/src/lam/Makefile.am b/src/lam/Makefile.am
index 23d31a2b9a..1e56d8b427 100644
--- a/src/lam/Makefile.am
+++ b/src/lam/Makefile.am
@@ -5,7 +5,7 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS	= ctnetwork lfc mem os threads util
+SUBDIRS	= ctnetwork lfc mem os runtime threads util
 
 headers = \
         atomic.h \
diff --git a/src/mpi/Makefile.am b/src/mpi/Makefile.am
index b198b253a6..793a8d9740 100644
--- a/src/mpi/Makefile.am
+++ b/src/mpi/Makefile.am
@@ -5,7 +5,7 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = communicator datatype interface
+SUBDIRS = communicator datatype interface runtime
 
 # If the --enable-single-library flag was given to configure, then the
 # user wants to merge liblam and libmpi into a single big, honkin'
@@ -23,11 +23,10 @@ endif
 lib_LTLIBRARIES = $(install_lib)
 noinst_LTLIBRARIES = $(convenience_lib)
 
-# To be added shortly
-#        communicator/libmpi_communicator.la 
 sources = \
         datatype/libmpi_datatype.la \
-        interface/libmpi_interface.la
+        interface/libmpi_interface.la \
+        runtime/libmpi_runtime.la
 
 libmpi_la_SOURCES =
 libmpi_la_LIBADD = $(sources)