diff --git a/Makefile.am b/Makefile.am
index 2180ecc37..2b46d5624 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,8 @@ include wolfssl/include.am
 include certs/include.am
 include certs/1024/include.am
 include certs/crl/include.am
+include certs/external/include.am
+include certs/ocsp/include.am
 include doc/include.am
 include swig/include.am
 
diff --git a/certs/external/include.am b/certs/external/include.am
new file mode 100644
index 000000000..a6fa17f64
--- /dev/null
+++ b/certs/external/include.am
@@ -0,0 +1,7 @@
+# vim:ft=automake
+# All paths should be given relative to the root
+#
+
+EXTRA_DIST += \
+	     certs/external/ca-globalsign-root-r2.pem \
+	     certs/external/ca-verisign-g5.pem
diff --git a/certs/ocsp/include.am b/certs/ocsp/include.am
new file mode 100644
index 000000000..cd5457f9e
--- /dev/null
+++ b/certs/ocsp/include.am
@@ -0,0 +1,34 @@
+# vim:ft=automake
+# All paths should be given relative to the root
+#
+
+EXTRA_DIST += \
+        certs/ocsp/index0.txt \
+        certs/ocsp/index1.txt \
+        certs/ocsp/index2.txt \
+        certs/ocsp/index3.txt \
+        certs/ocsp/openssl.cnf \
+        certs/ocsp/ocspd0.sh \
+        certs/ocsp/ocspd1.sh \
+        certs/ocsp/ocspd2.sh \
+        certs/ocsp/ocspd3.sh \
+        certs/ocsp/intermediate1-ca-key.pem \
+        certs/ocsp/intermediate1-ca-cert.pem \
+        certs/ocsp/intermediate2-ca-key.pem \
+        certs/ocsp/intermediate2-ca-cert.pem \
+        certs/ocsp/intermediate3-ca-key.pem \
+        certs/ocsp/intermediate3-ca-cert.pem \
+        certs/ocsp/ocsp-responder-key.pem \
+        certs/ocsp/ocsp-responder-cert.pem \
+        certs/ocsp/server1-key.pem \
+        certs/ocsp/server1-cert.pem \
+        certs/ocsp/server2-key.pem \
+        certs/ocsp/server2-cert.pem \
+        certs/ocsp/server3-key.pem \
+        certs/ocsp/server3-cert.pem \
+        certs/ocsp/server4-key.pem \
+        certs/ocsp/server4-cert.pem \
+        certs/ocsp/server5-key.pem \
+        certs/ocsp/server5-cert.pem \
+        certs/ocsp/root-ca-key.pem \
+        certs/ocsp/root-ca-cert.pem