diff --git a/Makefile.ompi-rules b/Makefile.ompi-rules
index 2a9cb2b7b5..d7e1041ca9 100644
--- a/Makefile.ompi-rules
+++ b/Makefile.ompi-rules
@@ -1,5 +1,5 @@
 # -*- makefile -*-
-# Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2018 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -20,7 +20,7 @@ if ! MAN_PAGE_BUILD_USEMPIF08_BINDINGS
 endif
 
 .1in.1:
-	$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
+	$(OMPI_V_GEN) $(top_srcdir)/config/make_manpage.pl \
 	  --package-name='@PACKAGE_NAME@' \
 	  --package-version='@PACKAGE_VERSION@' \
 	  --ompi-date='@OMPI_RELEASE_DATE@' \
@@ -30,7 +30,7 @@ endif
 	  --output=$@
 
 .3in.3:
-	$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
+	$(OMPI_V_GEN) $(top_srcdir)/config/make_manpage.pl \
 	  --package-name='@PACKAGE_NAME@' \
 	  --package-version='@PACKAGE_VERSION@' \
 	  --ompi-date='@OMPI_RELEASE_DATE@' \
@@ -41,7 +41,7 @@ endif
 	  --output=$@
 
 .7in.7:
-	$(OMPI_V_GEN) $(top_srcdir)/ompi/mpi/man/make_manpage.pl \
+	$(OMPI_V_GEN) $(top_srcdir)/config/make_manpage.pl \
 	  --package-name='@PACKAGE_NAME@' \
 	  --package-version='@PACKAGE_VERSION@' \
 	  --ompi-date='@OMPI_RELEASE_DATE@' \
diff --git a/config/Makefile.am b/config/Makefile.am
index 85a222a7c9..4379498100 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2018 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2010      Oracle and/or its affiliates.  All rights
 #                         reserved.
 # Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
@@ -28,7 +28,8 @@ EXTRA_DIST = \
         ltmain_nag_pthread.diff \
         ltmain_pgi_tp.diff \
         opal_mca_priority_sort.pl \
-        find_common_syms
+        find_common_syms \
+        make_manpage.pl
 
 maintainer-clean-local:
 	rm -f opal_get_version.sh
diff --git a/ompi/mpi/man/make_manpage.pl b/config/make_manpage.pl
similarity index 100%
rename from ompi/mpi/man/make_manpage.pl
rename to config/make_manpage.pl
diff --git a/ompi/mpi/Makefile.am b/ompi/mpi/Makefile.am
index f4d2970b6c..388076307c 100644
--- a/ompi/mpi/Makefile.am
+++ b/ompi/mpi/Makefile.am
@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2018 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
@@ -20,7 +20,6 @@
 #
 
 EXTRA_DIST = \
-        mpi/fortran/configure-fortran-output-bottom.h \
-        mpi/man/make_manpage.pl
+        mpi/fortran/configure-fortran-output-bottom.h
 
 dist_ompidata_DATA += mpi/help-mpi-api.txt