diff --git a/Makefile.am b/Makefile.am
index 651b60afb..02fea25cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,7 @@ include mqx/ctaocrypt_test/Sources/include.am
 include mqx/cyassl/include.am
 include mqx/cyassl_client/Sources/include.am
 include mqx/util_lib/Sources/include.am
+include mplabx/include.am
 include mplabx/ctaocrypt_benchmark.X/nbproject/include.am
 include mplabx/ctaocrypt_test.X/nbproject/include.am
 include mplabx/cyassl.X/nbproject/include.am
diff --git a/mcapi/ctaocrypt_test.X/nbproject/include.am b/mcapi/ctaocrypt_test.X/nbproject/include.am
index ec09b769e..dc3d2f9a2 100644
--- a/mcapi/ctaocrypt_test.X/nbproject/include.am
+++ b/mcapi/ctaocrypt_test.X/nbproject/include.am
@@ -3,8 +3,7 @@
 #
 
 EXTRA_DIST += \
-         mcapi/ctaocrypt_test.X/Makefile \
-         mcapi/ctaocrypt_test.X/main.c
+         mcapi/ctaocrypt_test.X/Makefile
 
 EXTRA_DIST += \
          mcapi/ctaocrypt_test.X/nbproject/configurations.xml \
diff --git a/mcapi/cyassl.X/nbproject/include.am b/mcapi/cyassl.X/nbproject/include.am
index 163090026..fc7e8d972 100644
--- a/mcapi/cyassl.X/nbproject/include.am
+++ b/mcapi/cyassl.X/nbproject/include.am
@@ -3,7 +3,6 @@
 #
 
 EXTRA_DIST += \
-         mcapi/README \
          mcapi/cyassl.X/Makefile
 
 EXTRA_DIST += \
diff --git a/mcapi/include.am b/mcapi/include.am
index 311fe4510..993ba29c0 100644
--- a/mcapi/include.am
+++ b/mcapi/include.am
@@ -12,3 +12,8 @@ mcapi_test_DEPENDENCIES = src/libcyassl.la
 endif
 
 noinst_HEADERS += mcapi/crypto.h
+
+EXTRA_DIST += \
+         mcapi/README \
+		 mcapi/PIC32MZ-serial.h
+
diff --git a/mplabx/ctaocrypt_benchmark.X/nbproject/include.am b/mplabx/ctaocrypt_benchmark.X/nbproject/include.am
index 567fbba38..9af74c3b8 100644
--- a/mplabx/ctaocrypt_benchmark.X/nbproject/include.am
+++ b/mplabx/ctaocrypt_benchmark.X/nbproject/include.am
@@ -3,8 +3,7 @@
 #
 
 EXTRA_DIST += \
-         mplabx/ctaocrypt_benchmark.X/Makefile \
-         mplabx/ctaocrypt_benchmark.X/main.c
+         mplabx/ctaocrypt_benchmark.X/Makefile
 
 EXTRA_DIST += \
          mplabx/ctaocrypt_benchmark.X/nbproject/configurations.xml \
diff --git a/mplabx/ctaocrypt_test.X/nbproject/include.am b/mplabx/ctaocrypt_test.X/nbproject/include.am
index e7d868de8..ea0df611c 100644
--- a/mplabx/ctaocrypt_test.X/nbproject/include.am
+++ b/mplabx/ctaocrypt_test.X/nbproject/include.am
@@ -3,8 +3,7 @@
 #
 
 EXTRA_DIST += \
-         mplabx/ctaocrypt_test.X/Makefile \
-         mplabx/ctaocrypt_test.X/main.c
+         mplabx/ctaocrypt_test.X/Makefile
 
 EXTRA_DIST += \
          mplabx/ctaocrypt_test.X/nbproject/configurations.xml \
diff --git a/mplabx/cyassl.X/nbproject/include.am b/mplabx/cyassl.X/nbproject/include.am
index 4db3841b2..7d0b98793 100644
--- a/mplabx/cyassl.X/nbproject/include.am
+++ b/mplabx/cyassl.X/nbproject/include.am
@@ -3,7 +3,6 @@
 #
 
 EXTRA_DIST += \
-         mplabx/README \
          mplabx/cyassl.X/Makefile
 
 EXTRA_DIST += \
diff --git a/mplabx/include.am b/mplabx/include.am
new file mode 100644
index 000000000..b63cdecaa
--- /dev/null
+++ b/mplabx/include.am
@@ -0,0 +1,10 @@
+# vim:ft=automake
+# All paths should be given relative to the root
+#
+
+EXTRA_DIST += \
+         mplabx/PIC32MZ-serial.h \
+		 mplabx/README \
+		 mplabx/benchmark_main.c \
+		 mplabx/test_main.c
+