diff --git a/src/mpi/Makefile.am b/src/mpi/Makefile.am
index 6c67f6e005..4769aaf9bf 100644
--- a/src/mpi/Makefile.am
+++ b/src/mpi/Makefile.am
@@ -10,6 +10,7 @@ SUBDIRS = communicator datatype interface proc request runtime
 noinst_LTLIBRARIES = libmpi_convenience.la
 
 sources = \
+        communicator/libmpi_communicator.la \
         datatype/libmpi_datatype.la \
         interface/libmpi_interface.la \
         proc/libmpi_proc.la \
diff --git a/src/mpi/communicator/Makefile.am b/src/mpi/communicator/Makefile.am
index bd124b7ad6..7329fb54a3 100644
--- a/src/mpi/communicator/Makefile.am
+++ b/src/mpi/communicator/Makefile.am
@@ -5,11 +5,17 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+noinst_LTLIBRARIES = libmpi_communicator.la
+
 # Source code files
 
 headers = \
         communicator.h
 
+libmpi_communicator_la_SOURCES = \
+        $(headers) \
+        mpi_comm_globals.c
+
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
diff --git a/src/mpi/communicator/mpi_comm_globals.c b/src/mpi/communicator/mpi_comm_globals.c
new file mode 100644
index 0000000000..0d49b557f6
--- /dev/null
+++ b/src/mpi/communicator/mpi_comm_globals.c
@@ -0,0 +1,18 @@
+/*
+ * $HEADER$
+ */
+
+#include "lam_config.h"
+
+#include <stdio.h>
+
+#include "mpi.h"
+#include "mpi/communicator/communicator.h"
+
+
+/*
+ * Global variables
+ */
+
+lam_communicator_t lam_mpi_comm_world;
+lam_communicator_t lam_mpi_comm_self;