diff --git a/opal/mca/paffinity/linux/Makefile.am b/opal/mca/paffinity/linux/Makefile.am
index 3b31597631..d1945d04fe 100644
--- a/opal/mca/paffinity/linux/Makefile.am
+++ b/opal/mca/paffinity/linux/Makefile.am
@@ -19,6 +19,9 @@
 
 SUBDIRS = plpa
 
+# To find plpa_bottom.h
+AM_CPPFLAGS = -I$(top_srcdir)/opal/mca/paffinity/linux/plpa/src/libplpa
+
 sources = \
         paffinity_linux.h \
         paffinity_linux_component.c \
@@ -28,8 +31,6 @@ sources = \
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
-AM_CPPFLAGS = -I$(top_srcdir)/opal/mca/paffinity/linux/plpa/src/libplpa
-
 if OMPI_BUILD_paffinity_linux_DSO
 component_noinst =
 component_install = mca_paffinity_linux.la
diff --git a/opal/mca/paffinity/linux/plpa/Makefile.am b/opal/mca/paffinity/linux/plpa/Makefile.am
index 6878af7948..82fc4acadf 100644
--- a/opal/mca/paffinity/linux/plpa/Makefile.am
+++ b/opal/mca/paffinity/linux/plpa/Makefile.am
@@ -15,5 +15,7 @@ SUBDIRS = src
 DIST_SUBDIRS = config $(SUBDIRS)
 EXTRA_DIST = README VERSION LICENSE AUTHORS
 
+if PLPA_BUILD_STANDALONE
 dist-hook:
 	csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(PLPA_VERSION)" "$(PLPA_SVN_R)"
+endif
diff --git a/opal/mca/paffinity/linux/plpa/config/plpa.m4 b/opal/mca/paffinity/linux/plpa/config/plpa.m4
index fc292ba709..b4d3f90908 100644
--- a/opal/mca/paffinity/linux/plpa/config/plpa.m4
+++ b/opal/mca/paffinity/linux/plpa/config/plpa.m4
@@ -264,9 +264,10 @@ AC_DEFUN([_PLPA_INIT],[
     # If we're building executables, we need some things for plpa-taskset
     if test "$plpa_executables" = "yes"; then
         AC_C_INLINE
-        AM_PROG_LEX
-        AC_PROG_YACC
     fi
+    # Always need these for make dist (both included and standalone)
+    AM_PROG_LEX
+    AC_PROG_YACC
 
     # Success
     $1
diff --git a/opal/mca/paffinity/linux/plpa/src/libplpa/plpa.h.in b/opal/mca/paffinity/linux/plpa/src/libplpa/plpa.h.in
index 6a2a38d702..6fc10a75cf 100644
--- a/opal/mca/paffinity/linux/plpa/src/libplpa/plpa.h.in
+++ b/opal/mca/paffinity/linux/plpa/src/libplpa/plpa.h.in
@@ -48,6 +48,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
@@ -91,6 +95,12 @@
    `char[]'. */
 #undef YYTEXT_POINTER
 
+/* Emulated value */
+#undef __NR_sched_getaffinity
+
+/* Emulated value */
+#undef __NR_sched_setaffinity
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus