diff --git a/Makefile.am b/Makefile.am
index 95d4ead56..836266530 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,10 +21,6 @@ exampledir = $(docdir)/@PACKAGE@/example
 example_DATA=
 EXTRA_DIST+= $(example_DATA)
 
-certsdir = $(sysconfdir)/ssl/certs
-certs_DATA=
-EXTRA_DIST+= $(certs_DATA)
-
 EXTRA_DIST+= $(doc_DATA)
 
 ACLOCAL_AMFLAGS= -I m4 --install
diff --git a/certs/crl/include.am b/certs/crl/include.am
index b6d05261d..2f4a20ba9 100644
--- a/certs/crl/include.am
+++ b/certs/crl/include.am
@@ -2,12 +2,11 @@
 # All paths should be given relative to the root
 #
 
-certs_DATA+= \
+EXTRA_DIST += \
 	     certs/crl/crl.pem \
 	     certs/crl/cliCrl.pem
 
-certs_DATA+= \
+EXTRA_DIST += \
 	     certs/crl/crl.revoked
 
-EXTRA_DIST+= ${certs_DATA}
 
diff --git a/certs/include.am b/certs/include.am
index b32c2aaf0..a027c57b4 100644
--- a/certs/include.am
+++ b/certs/include.am
@@ -2,7 +2,7 @@
 # All paths should be given relative to the root
 #
 
-certs_DATA+= \
+EXTRA_DIST += \
 	     certs/ca-cert.pem \
 	     certs/ca-key.pem \
 	     certs/client-cert.pem \
@@ -23,7 +23,7 @@ certs_DATA+= \
 	     certs/server-keyPkcs8Enc.pem \
 	     certs/server-keyPkcs8.pem
 
-certs_DATA+= \
+EXTRA_DIST += \
 	     certs/ca-key.der \
 	     certs/client-cert.der \
 	     certs/client-key.der \
@@ -32,7 +32,6 @@ certs_DATA+= \
 	     certs/dsa2048.der \
 	     certs/ecc-key.der
 
-EXTRA_DIST+= ${certs_DATA}
 
 doc_DATA+= certs/taoCert.txt