diff --git a/ompi/mca/btl/base/Makefile.am b/ompi/mca/btl/base/Makefile.am
index caf8927ffc..3a366e64c9 100644
--- a/ompi/mca/btl/base/Makefile.am
+++ b/ompi/mca/btl/base/Makefile.am
@@ -20,8 +20,7 @@ noinst_LTLIBRARIES = libmca_btl_base.la
 
 # Source code files
 
-pkgdata_DATA = help-mpi-btl-base.txt
-EXTRA_DIST = $(pkgdata_DATA)
+dist_pkgdata_DATA = help-mpi-btl-base.txt
 
 headers = \
         base.h \
diff --git a/ompi/mca/coll/base/Makefile.am b/ompi/mca/coll/base/Makefile.am
index 3b7e9702cc..79919b2f04 100644
--- a/ompi/mca/coll/base/Makefile.am
+++ b/ompi/mca/coll/base/Makefile.am
@@ -14,15 +14,11 @@
 # $HEADER$
 #
 
-
-
-EXTRA_DIST = $(pkgdata_DATA)
-
 AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
 
 noinst_LTLIBRARIES = libmca_coll_base.la
 
-pkgdata_DATA = help-mca-coll-base.txt
+dist_pkgdata_DATA = help-mca-coll-base.txt
 
 headers = \
         base.h \
diff --git a/ompi/runtime/Makefile.am b/ompi/runtime/Makefile.am
index 36ed46fc55..35356c2fe3 100644
--- a/ompi/runtime/Makefile.am
+++ b/ompi/runtime/Makefile.am
@@ -14,15 +14,11 @@
 # $HEADER$
 #
 
-
-
 AM_CPPFLAGS = -I$(top_builddir)/src/event
 
-EXTRA_DIST = $(pkgdata_DATA)
-
 noinst_LTLIBRARIES = libmpiruntime.la
 
-pkgdata_DATA = help-mpi-runtime.txt
+dist_pkgdata_DATA = help-mpi-runtime.txt
 
 # Source code files
 
diff --git a/ompi/tools/ompi_info/Makefile.am b/ompi/tools/ompi_info/Makefile.am
index 4184b46346..1f6279a5a9 100644
--- a/ompi/tools/ompi_info/Makefile.am
+++ b/ompi/tools/ompi_info/Makefile.am
@@ -14,8 +14,6 @@
 # $HEADER$
 #
 
-
-
 AM_CPPFLAGS = \
             -DOMPI_PREFIX="\"$(prefix)\"" \
             -DOMPI_BINDIR="\"$(bindir)\"" \
@@ -48,9 +46,7 @@ AM_CPPFLAGS = \
             -DOPAL_WANT_SVN=\"@OPAL_WANT_SVN@\" \
             -DOPAL_SVN_R=\"@OPAL_SVN_R@\"
 
-pkgdata_DATA = help-ompi_info.txt
-
-EXTRA_DIST = $(pkgdata_DATA)
+dist_pkgdata_DATA = help-ompi_info.txt
 
 libs = \
         $(top_builddir)/ompi/libmpi.la \
diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am
index 98c43520b2..6feee98512 100644
--- a/ompi/tools/wrappers/Makefile.am
+++ b/ompi/tools/wrappers/Makefile.am
@@ -14,7 +14,7 @@
 # $HEADER$
 #
 
-
+dist_pkgdata_DATA = help-wrapper.txt
 
 # This is ugly, but we need it so that people can change things at
 # "make" time (e.g., "make sysconfdir=/foo/bar all") as documented in
@@ -32,9 +32,7 @@ else
 AM_CPPFLAGS += -DOMPI_WANT_DEVEL_HEADERS=0
 endif
 
-EXTRA_DIST = wrap.cc wrap_engine.cc $(pkgdata_DATA)
-
-pkgdata_DATA = help-wrapper.txt
+EXTRA_DIST = wrap.cc wrap_engine.cc
 
 bin_PROGRAMS = mpicc mpic++ mpif77 mpif90
 
diff --git a/opal/mca/base/Makefile.am b/opal/mca/base/Makefile.am
index f4bdede6c2..3e275265df 100644
--- a/opal/mca/base/Makefile.am
+++ b/opal/mca/base/Makefile.am
@@ -14,8 +14,6 @@
 # $HEADER$
 #
 
-
-
 # Need this so that the base knows where to load dynamic components from
 # (by default)
 
@@ -26,11 +24,9 @@ AM_CPPFLAGS = \
 AM_LFLAGS = -Pmca_base_yy
 LEX_OUTPUT_ROOT = lex.mca_base_yy
 
-EXTRA_DIST = $(pkgdata_DATA)
-
 noinst_LTLIBRARIES = libmca_base.la
 
-pkgdata_DATA = help-mca-base.txt help-mca-param.txt
+dist_pkgdata_DATA = help-mca-base.txt help-mca-param.txt
 
 # Source code files
 
diff --git a/orte/mca/pls/bproc/Makefile.am b/orte/mca/pls/bproc/Makefile.am
index 6c8c559e2c..6f73857e69 100644
--- a/orte/mca/pls/bproc/Makefile.am
+++ b/orte/mca/pls/bproc/Makefile.am
@@ -14,10 +14,7 @@
 # $HEADER$
 #
 
-
-
-EXTRA_DIST = $(pkgdata_DATA)
-pkgdata_DATA = help-pls-bproc.txt
+dist_pkgdata_DATA = help-pls-bproc.txt
 
 AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include $(pls_bproc_CPPFLAGS) -DORTE_BINDIR="\"$(bindir)\""
 
diff --git a/orte/mca/pls/rsh/Makefile.am b/orte/mca/pls/rsh/Makefile.am
index 2689f99870..b405f782ce 100644
--- a/orte/mca/pls/rsh/Makefile.am
+++ b/orte/mca/pls/rsh/Makefile.am
@@ -14,12 +14,7 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
-EXTRA_DIST = $(pkgdata_DATA)
-pkgdata_DATA = help-pls-rsh.txt
+dist_pkgdata_DATA = help-pls-rsh.txt
 
 AM_CPPFLAGS = -DOMPI_BINDIR="\"$(bindir)\""
 
diff --git a/orte/mca/ras/slurm/Makefile.am b/orte/mca/ras/slurm/Makefile.am
index c75efdd688..c32580f9ce 100644
--- a/orte/mca/ras/slurm/Makefile.am
+++ b/orte/mca/ras/slurm/Makefile.am
@@ -14,14 +14,9 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(ras_slurm_CPPFLAGS)
 
-EXTRA_DIST = $(pkgdata_DATA)
-pkgdata_DATA = help-ras-slurm.txt
+dist_pkgdata_DATA = help-ras-slurm.txt
 
 sources = \
         ras_slurm.h \
diff --git a/orte/tools/console/Makefile.am b/orte/tools/console/Makefile.am
index 23afdbd653..af281cbf38 100644
--- a/orte/tools/console/Makefile.am
+++ b/orte/tools/console/Makefile.am
@@ -14,10 +14,7 @@
 # $HEADER$
 #
 
-
-
-EXTRA_DIST = $(pkgdata_DATA)
-pkgdata_DATA = help-orteconsole.txt
+dist_pkgdata_DATA = help-orteconsole.txt
 
 libs = \
         $(top_builddir)/orte/liborte.la
diff --git a/orte/tools/orted/Makefile.am b/orte/tools/orted/Makefile.am
index 92f4f2d98a..5d078fba4d 100644
--- a/orte/tools/orted/Makefile.am
+++ b/orte/tools/orted/Makefile.am
@@ -14,10 +14,7 @@
 # $HEADER$
 #
 
-
-
-EXTRA_DIST = $(pkgdata_DATA)
-pkgdata_DATA = help-orted.txt
+dist_pkgdata_DATA = help-orted.txt
 
 AM_CPPFLAGS = \
             -DOMPI_PREFIX="\"$(prefix)\"" \
diff --git a/orte/tools/orteprobe/Makefile.am b/orte/tools/orteprobe/Makefile.am
index c33f9a09f7..89028a0bb2 100644
--- a/orte/tools/orteprobe/Makefile.am
+++ b/orte/tools/orteprobe/Makefile.am
@@ -14,10 +14,7 @@
 # $HEADER$
 #
 
-
-
-EXTRA_DIST = $(pkgdata_DATA)
-pkgdata_DATA = help-orteprobe.txt
+dist_pkgdata_DATA = help-orteprobe.txt
 
 AM_CPPFLAGS = \
             -DOMPI_PREFIX="\"$(prefix)\"" \
diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am
index 87f1de2cbe..fcd399d88a 100644
--- a/orte/tools/orterun/Makefile.am
+++ b/orte/tools/orterun/Makefile.am
@@ -14,10 +14,7 @@
 # $HEADER$
 #
 
-
-
-EXTRA_DIST = $(pkgdata_DATA)
-pkgdata_DATA = help-orterun.txt
+dist_pkgdata_DATA = help-orterun.txt
 
 # This is not quite in the Automake spirit, but we have to do it.
 # Since the totalview portion of the library must be built with -g, we