diff --git a/orte/config/config_files.m4 b/orte/config/config_files.m4
index be7fd54cda..1957e6f578 100644
--- a/orte/config/config_files.m4
+++ b/orte/config/config_files.m4
@@ -32,7 +32,7 @@ AC_DEFUN([ORTE_CONFIG_FILES],[
         orte/tools/orte-top/Makefile
         orte/tools/orte-migrate/Makefile
         orte/tools/orte-info/Makefile
-        orte/tools/mapreduce/Makefile
+        orte/tools/mrplus/Makefile
         orte/tools/allocators/Makefile
         orte/tools/allocators/hdfsalloc.pl
     ])
diff --git a/orte/tools/Makefile.am b/orte/tools/Makefile.am
index 4da02c6851..855a63ed44 100644
--- a/orte/tools/Makefile.am
+++ b/orte/tools/Makefile.am
@@ -35,11 +35,12 @@ SUBDIRS += \
 	tools/wrappers \
         tools/orte-top \
         tools/orte-info \
-        tools/orte-migrate \
-	tools/mapreduce
+        tools/orte-migrate
 
 #if ORTE_WANT_HADOOP_SUPPORT
-SUBDIRS += tools/allocators
+SUBDIRS += \
+	tools/allocators \
+	tools/mrplus
 #endif
 
 DIST_SUBDIRS += \
@@ -53,6 +54,6 @@ DIST_SUBDIRS += \
         tools/orte-top \
         tools/orte-info \
         tools/orte-migrate \
-	tools/mapreduce \
+	tools/mrplus \
         tools/allocators
 
diff --git a/orte/tools/mapreduce/Makefile.am b/orte/tools/mrplus/Makefile.am
similarity index 71%
rename from orte/tools/mapreduce/Makefile.am
rename to orte/tools/mrplus/Makefile.am
index e054a22651..2126bd52c2 100644
--- a/orte/tools/mapreduce/Makefile.am
+++ b/orte/tools/mrplus/Makefile.am
@@ -10,22 +10,22 @@
 
 include $(top_srcdir)/Makefile.man-page-rules
 
-man_pages = mapreduce.1
+man_pages = mr+.1
 EXTRA_DIST = $(man_pages:.1=.1in)
 
 bin_PROGRAMS = 
 
-mapreduce_SOURCES = \
-        mapreduce.c
+mrplus_SOURCES = \
+	mrplus.c
 
-mapreduce_LDADD = $(top_builddir)/orte/libopen-rte.la
+mrplus_LDADD = $(top_builddir)/orte/libopen-rte.la
 
 # Ensure that the man pages are rebuilt if the opal_config.h file
 # changes; a "good enough" way to know if configure was run again (and
 # therefore the release date or version may have changed)
 $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 
-dist_pkgdata_DATA = help-mapreduce.txt
+dist_pkgdata_DATA = help-mr+.txt
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
@@ -33,10 +33,19 @@ if OMPI_INSTALL_BINARIES
 # Only do this stuff if we want Hadoop support
 if ORTE_WANT_HADOOP_SUPPORT
 
-bin_PROGRAMS += mapreduce
+bin_PROGRAMS += mrplus
+
+mr+: mrplus.c
 
 nodist_man_MANS = $(man_pages)
 
+install-exec-hook:
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	(cp mrplus $(DESTDIR)$(bindir)/mr+)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(bindir)/mr+
+
 endif 
 
 endif # OMPI_INSTALL_BINARIES
diff --git a/orte/tools/mapreduce/help-mapreduce.txt b/orte/tools/mrplus/help-mr+.txt
similarity index 100%
rename from orte/tools/mapreduce/help-mapreduce.txt
rename to orte/tools/mrplus/help-mr+.txt
diff --git a/orte/tools/mapreduce/mapreduce.1in b/orte/tools/mrplus/mr+.1in
similarity index 100%
rename from orte/tools/mapreduce/mapreduce.1in
rename to orte/tools/mrplus/mr+.1in
diff --git a/orte/tools/mapreduce/mapreduce.c b/orte/tools/mrplus/mrplus.c
similarity index 100%
rename from orte/tools/mapreduce/mapreduce.c
rename to orte/tools/mrplus/mrplus.c