diff --git a/src/mca/ns/base/Makefile.am b/src/mca/ns/base/Makefile.am
index efd4f8039a..550480daea 100644
--- a/src/mca/ns/base/Makefile.am
+++ b/src/mca/ns/base/Makefile.am
@@ -2,31 +2,34 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
+include $(top_srcdir)/config/Makefile.options
 
-include $(top_ompi_srcdir)/config/Makefile.options
+noinst_LTLIBRARIES = libmca_ns_base.la
 
-SUBDIRS = src
+# For VPATH builds, have to specify where static-modules.h will be found
 
-# Make the output library in this directory, and name it either
-# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
-# (for static builds).
+AM_CPPFLAGS = -I$(top_builddir)/src
 
-if OMPI_BUILD_ns_base_DSO
-component_noinst = 
-component_install = mca_ns_base.la
+# Source code files
+
+headers = \
+        base.h
+
+# Library
+
+libmca_ns_base_la_SOURCES = \
+        $(headers) \
+        ns_base_close.c \
+        ns_base_select.c \
+        ns_base_open.c \
+        ns_base_functions.c
+
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/mca/ns/base
+ompi_HEADERS = $(headers)
 else
-component_noinst = libmca_ns_base.la
-component_install =
+ompidir = $(includedir)
 endif
-
-mcacomponentdir = $(libdir)/openmpi
-mcacomponent_LTLIBRARIES = $(component_install)
-mca_ns_base_la_SOURCES =
-mca_ns_base_la_LIBADD = src/libmca_ns_base.la
-mca_ns_base_la_LDFLAGS = -module -avoid-version
-
-noinst_LTLIBRARIES = $(component_noinst)
-libmca_ns_base_la_SOURCES =
-libmca_ns_base_la_LIBADD = src/libmca_ns_base.la
-libmca_ns_base_la_LDFLAGS = -module -avoid-version
diff --git a/src/mca/ns/base/src/ns_base_close.c b/src/mca/ns/base/ns_base_close.c
similarity index 100%
rename from src/mca/ns/base/src/ns_base_close.c
rename to src/mca/ns/base/ns_base_close.c
diff --git a/src/mca/ns/base/ns_base_functions.c b/src/mca/ns/base/ns_base_functions.c
new file mode 100644
index 0000000000..c509e87a2e
--- /dev/null
+++ b/src/mca/ns/base/ns_base_functions.c
@@ -0,0 +1,195 @@
+/*
+ * $HEADER$
+ */
+/** @file:
+ *
+ */
+
+#include "ompi_config.h"
+#include "mca/mca.h"
+#include "mca/ns/base/base.h"
+#include "ns_replica.h"
+
+/**
+ * globals
+ */
+
+/*
+ * functions
+ */
+
+ompi_process_name_t* ns_base_create_process_name(ompi_process_id_t cell,
+		             ompi_process_id_t job, ompi_process_id_t vpid)
+{
+    ompi_process_name_t *newname;
+
+    newname = OBJ_NEW(ompi_process_name_t);
+    if (NULL == newname) { /* got an error */
+	return(NULL);
+    }
+
+    newname->cellid = cell;
+    newname->jobid = job;
+    newname->vpid = vpid;
+    return(newname);
+}
+
+
+char* ns_base_get_proc_name_string(const ompi_process_name_t* name)
+{
+    char *name_string;
+    int size;
+
+    if (NULL == name) { /* got an error */
+	return(NULL);
+    }
+
+    size = (3*sizeof(name->cellid)/4) + 3;
+    name_string = (char*)malloc(27*sizeof(char));
+    if (NULL == name_string) { /* got an error */
+	return(NULL);
+    }
+
+    sprintf(name_string, "%0x.%0x.%0x", name->cellid, name->jobid, name->vpid);
+    return(name_string);
+}
+
+
+char* ns_base_get_vpid_string(const ompi_process_name_t* name)
+{
+    char *name_string;
+    int size;
+
+    if (NULL == name) { /* got an error */
+	return(NULL);
+    }
+
+    size = 1 + sizeof(name->vpid)/4;
+    name_string = (char*)malloc(size*sizeof(char));
+    if (NULL == name_string) { /* got an error */
+	return(NULL);
+    }
+
+    sprintf(name_string, "%0x", name->vpid);
+    return(name_string);
+}
+
+
+char* ns_base_get_jobid_string(const ompi_process_name_t* name)
+{
+    char *name_string;
+    int size;
+
+    if (NULL == name) { /* got an error */
+	return(NULL);
+    }
+
+    size = 1 + sizeof(name->jobid);
+    name_string = (char*)malloc(size*sizeof(char));
+    if (NULL == name_string) { /* got an error */
+	return(NULL);
+    }
+
+    sprintf(name_string, "%0x", name->jobid);
+    return(name_string);
+}
+
+
+char* ns_base_get_cellid_string(const ompi_process_name_t* name)
+{
+    char *name_string;
+    int size;
+
+    if (NULL == name) { /* got an error */
+	return(NULL);
+    }
+
+    size = 1 + sizeof(name->cellid);
+    name_string = (char*)malloc(size*sizeof(char));
+    if (NULL == name_string) { /* got an error */
+	return(NULL);
+    }
+
+    sprintf(name_string, "%0x", name->cellid);
+    return(name_string);
+}
+
+
+ompi_process_id_t ns_base_get_vpid(const ompi_process_name_t* name)
+{
+    if (NULL == name) { /* got an error */
+	return(OMPI_NAME_SERVICE_MAX);
+    }
+
+    return(name->vpid);
+}
+
+
+ompi_process_id_t ns_base_get_jobid(const ompi_process_name_t* name)
+{
+    if (NULL == name) { /* got an error */
+	return(OMPI_NAME_SERVICE_MAX);
+    }
+
+    return(name->jobid);
+}
+
+ompi_process_id_t ns_base_get_cellid(const ompi_process_name_t* name)
+{
+    if (NULL == name) { /* got an error */
+	return(OMPI_NAME_SERVICE_MAX);
+    }
+
+    return(name->cellid);
+}
+
+
+int ns_base_compare(ompi_ns_cmp_bitmask_t fields,
+		    const ompi_process_name_t* name1,
+		    const ompi_process_name_t* name2)
+{
+    if ((fields <= 0) || (fields > 7) || NULL == name1 || NULL == name2) {  /* got an error */
+	return(-100);
+    }
+
+    if (OMPI_NS_CMP_CELLID & fields) { /* check cellid field */
+	if (name1->cellid < name2->cellid) {
+	    return(-1);
+	} else if (name1->cellid > name2->cellid) {
+	    return(1);
+	}
+    }
+
+    /* get here if cellid's are equal, or cellid not being checked */
+    /* now check job id */
+
+    if (OMPI_NS_CMP_JOBID & fields) {
+	if (name1->jobid < name2->jobid) {
+	    return(-1);
+	} else if (name1->jobid > name2->jobid) {
+	    return(1);
+	}
+    }
+
+    /* get here if cellid's and jobid's are equal, or neither being checked,
+     * or cellid not checked and jobid's equal.
+     * now check vpid
+     */
+
+    if (OMPI_NS_CMP_VPID & fields) {
+	if (name1->vpid < name2->vpid) {
+	    return(-1);
+	} else if (name1->vpid > name2->vpid) {
+	    return(1);
+	}
+    }
+
+    /* only way to get here is if all fields are being checked and are equal,
+     * or cellid not checked, but jobid and vpid equal,
+     * or cellid and jobid not checked, but vpid equal,
+     * only vpid being checked, and equal
+     * return that fact
+     */
+    return(0);
+}
+
diff --git a/src/mca/ns/base/src/ns_base_open.c b/src/mca/ns/base/ns_base_open.c
similarity index 100%
rename from src/mca/ns/base/src/ns_base_open.c
rename to src/mca/ns/base/ns_base_open.c
diff --git a/src/mca/ns/base/src/ns_base_select.c b/src/mca/ns/base/ns_base_select.c
similarity index 100%
rename from src/mca/ns/base/src/ns_base_select.c
rename to src/mca/ns/base/ns_base_select.c