diff --git a/configure.ac b/configure.ac
index 757d7977fa..0b9ff27503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1132,6 +1132,7 @@ AC_CONFIG_FILES([
     ompi/tools/wrappers/mpic++-wrapper-data.txt
     ompi/tools/wrappers/mpif77-wrapper-data.txt
     ompi/tools/wrappers/mpif90-wrapper-data.txt
+    ompi/tools/ortetools/Makefile
 
     test/Makefile
     test/event/Makefile
diff --git a/ompi/tools/Makefile.am b/ompi/tools/Makefile.am
index f70dc236fb..bea3b83803 100644
--- a/ompi/tools/Makefile.am
+++ b/ompi/tools/Makefile.am
@@ -23,8 +23,10 @@ EXTRA_DIST += tools/win_makefile
 
 SUBDIRS += \
 	tools/ompi_info \
-	tools/wrappers
+	tools/wrappers \
+	tools/ortetools
 
 DIST_SUBDIRS += \
 	tools/ompi_info \
-	tools/wrappers
+	tools/wrappers \
+	tools/ortetools
diff --git a/ompi/tools/ortetools/Makefile.am b/ompi/tools/ortetools/Makefile.am
new file mode 100644
index 0000000000..6c28930e7f
--- /dev/null
+++ b/ompi/tools/ortetools/Makefile.am
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  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$
+#
+
+dist_pkgdata_DATA = 
+
+man_MANS =  mpirun.1 \
+			mpiexec.1 \
+			ompi-ps.1 \
+			ompi-clean.1
+
+install-exec-hook:
+	(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpirun$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpiexec$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f ompi-ps$(EXEEXT); $(LN_S) orte-ps$(EXEEXT) ompi-ps$(EXEEXT))
+	(cd $(DESTDIR)$(bindir); rm -f ompi-clean$(EXEEXT); $(LN_S) orte-clean$(EXEEXT) ompi-clean$(EXEEXT))
+
+uninstall-local:
+	rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
+		$(DESTDIR)$(bindir)/mpiexec$(EXEEXT) \
+		$(DESTDIR)$(bindir)/ompi-ps$(EXEEXT) \
+		$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT)
+
+mpirun.1: $(top_srcdir)/orte/tools/orterun/orterun.1
+	cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpirun.1
+
+mpiexec.1: $(top_srcdir)/orte/tools/orterun/orterun.1
+	cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpiexec.1
+
+ompi-ps.1: $(top_srcdir)/orte/tools/orte-ps/orte-ps.1
+	cp -f $(top_srcdir)/orte/tools/orte-ps/orte-ps.1 ompi-ps.1
+
+ompi-clean.1: $(top_srcdir)/orte/tools/orte-clean/orte-clean.1
+	cp -f $(top_srcdir)/orte/tools/orte-clean/orte-clean.1 ompi-clean.1
+
+distclean-local:
+	rm -f mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1
diff --git a/orte/tools/orte-clean/Makefile.am b/orte/tools/orte-clean/Makefile.am
index eb1ce0489c..2b1513f78f 100644
--- a/orte/tools/orte-clean/Makefile.am
+++ b/orte/tools/orte-clean/Makefile.am
@@ -26,20 +26,9 @@ orte_clean_SOURCES = \
 	orte-clean.c
 
 # Manual pages
-man_MANS = orte-clean.1 ompi-clean.1
+man_MANS = orte-clean.1
 EXTRA_DIST = orte-clean.1
 
 orte_clean_LDADD = $(top_builddir)/orte/liborte.la
 orte_clean_DEPENDENCIES = $(top_builddir)/orte/liborte.la
 
-install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f ompi-clean$(EXEEXT); $(LN_S) orte-clean$(EXEEXT) ompi-clean$(EXEEXT))
-
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/ompi-clean$(EXEEXT)
-
-ompi-clean.1: $(top_srcdir)/orte/tools/orte-clean/orte-clean.1
-	cp -f $(top_srcdir)/orte/tools/orte-clean/orte-clean.1 ompi-clean.1
-
-distclean-local:
-	rm -f ompi-clean.1
diff --git a/orte/tools/orte-ps/Makefile.am b/orte/tools/orte-ps/Makefile.am
index 19fb515fa2..d6995329a7 100644
--- a/orte/tools/orte-ps/Makefile.am
+++ b/orte/tools/orte-ps/Makefile.am
@@ -26,20 +26,9 @@ orte_ps_SOURCES = \
 	orte-ps.c
 
 # Manual pages
-man_MANS = orte-ps.1 ompi-ps.1
+man_MANS = orte-ps.1
 EXTRA_DIST = orte-ps.1
 
 orte_ps_LDADD = $(top_builddir)/orte/liborte.la
 orte_ps_DEPENDENCIES = $(top_builddir)/orte/liborte.la
 
-install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f ompi-ps$(EXEEXT); $(LN_S) orte-ps$(EXEEXT) ompi-ps$(EXEEXT))
-
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/ompi-ps$(EXEEXT)
-
-ompi-ps.1: $(top_srcdir)/orte/tools/orte-ps/orte-ps.1
-	cp -f $(top_srcdir)/orte/tools/orte-ps/orte-ps.1 ompi-ps.1
-
-distclean-local:
-	rm -f ompi-ps.1
diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am
index e44725c5ab..1f78e786da 100644
--- a/orte/tools/orterun/Makefile.am
+++ b/orte/tools/orterun/Makefile.am
@@ -46,24 +46,7 @@ dist_pkgdata_DATA = help-orterun.txt
 
 # AM 1.9.6 seems to have a bug in it's dependencies for install-man if
 #dist_ and nodist_ are used, so explicitly add to EXTRA_DIST...
-man_MANS = orterun.1 mpirun.1 mpiexec.1
+man_MANS = orterun.1
 EXTRA_DIST = orterun.1
 
-install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpirun$(EXEEXT))
-	(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpiexec$(EXEEXT))
-
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
-		$(DESTDIR)$(bindir)/mpiexec$(EXEEXT)
-
-mpirun.1: $(top_srcdir)/orte/tools/orterun/orterun.1
-	cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpirun.1
-
-mpiexec.1: $(top_srcdir)/orte/tools/orterun/orterun.1
-	cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpiexec.1
-
-distclean-local:
-	rm -f mpirun.1 mpiexec.1
-
 endif