diff --git a/npa/Makefile.am b/npa/Makefile.am
index 6628066..2994f82 100644
--- a/npa/Makefile.am
+++ b/npa/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src m4 doc win32
+SUBDIRS = src m4 doc win32 certs
 
 EXTRA_DIST = libnpa.pc.in apdus test_vicc_with_npa-tool.sh
 
diff --git a/npa/certs/Makefile.am b/npa/certs/Makefile.am
new file mode 100644
index 0000000..415e255
--- /dev/null
+++ b/npa/certs/Makefile.am
@@ -0,0 +1,8 @@
+CV_CERTS = at_cert_19a.cvcert at_cert_19a_ecdh.cvcert cvca-eid.cv dv_cert_19.cvcert dv_cert_19_ecdh.cvcert
+X509_CERTS = csca-germany_013_self_signed_cer.cer
+
+EXTRA_DIST = $(CV_CERTS) $(X509_CERTS)
+
+install-data-local:
+	for cert in $(X509_CERTS); do $(INSTALL_DATA) $(srcdir)/$${cert} "$(X509DIR)"; done
+	for cert in $(CV_CERTS);   do $(INSTALL_DATA) $(srcdir)/$${cert} "$(CVCDIR)";  done
diff --git a/npa/certs/at_cert_19a.cvcert b/npa/certs/at_cert_19a.cvcert
new file mode 100644
index 0000000..d31ff42
Binary files /dev/null and b/npa/certs/at_cert_19a.cvcert differ
diff --git a/npa/certs/at_cert_19a_ecdh.cvcert b/npa/certs/at_cert_19a_ecdh.cvcert
new file mode 100644
index 0000000..1673320
Binary files /dev/null and b/npa/certs/at_cert_19a_ecdh.cvcert differ
diff --git a/npa/certs/csca-germany_013_self_signed_cer.cer b/npa/certs/csca-germany_013_self_signed_cer.cer
new file mode 100644
index 0000000..b645bbe
Binary files /dev/null and b/npa/certs/csca-germany_013_self_signed_cer.cer differ
diff --git a/npa/certs/cvca-eid.cv b/npa/certs/cvca-eid.cv
new file mode 100644
index 0000000..55d289c
Binary files /dev/null and b/npa/certs/cvca-eid.cv differ
diff --git a/npa/certs/dv_cert_19.cvcert b/npa/certs/dv_cert_19.cvcert
new file mode 100644
index 0000000..ecefe51
Binary files /dev/null and b/npa/certs/dv_cert_19.cvcert differ
diff --git a/npa/certs/dv_cert_19_ecdh.cvcert b/npa/certs/dv_cert_19_ecdh.cvcert
new file mode 100644
index 0000000..e32fa90
Binary files /dev/null and b/npa/certs/dv_cert_19_ecdh.cvcert differ
diff --git a/npa/configure.ac b/npa/configure.ac
index c14c26b..46799b1 100644
--- a/npa/configure.ac
+++ b/npa/configure.ac
@@ -47,7 +47,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 
 # Checks for libraries.
-test -z "$OPENSC_LIBS" && OPENSC_LIBS="-lopensc"
+test -z "$OPENSC_LIBS" && OPENSC_LIBS="-lopensc -lcrypto"
 test -z "$OPENSC_CFLAGS" && OPENSC_CFLAGS="-I${PWD}/${srcdir}/src/opensc/src -DENABLE_SM"
 
 saved_CPPFLAGS="$CPPFLAGS"
@@ -106,6 +106,41 @@ CPPFLAGS="$saved_CPPFLAGS"
 LIBS="$saved_LIBS"
 
 
+AC_ARG_ENABLE(cvcdir,
+              AC_HELP_STRING([--enable-cvcdir=DIR],
+                             [directory containing CV certificates (default is determined by libeac)]),
+                             [cvcdir="${enableval}"],
+                             [cvcdir=false])
+if test "${cvcdir}" = false ; then
+    cvcdir="`$PKG_CONFIG libeac --variable=cvcdir`"
+fi
+if test "${cvcdir}" = "" ; then
+    AC_MSG_ERROR([use --enable-cvcdir=DIR])
+fi
+CVCDIR="${cvcdir}"
+AC_SUBST(CVCDIR)
+
+AC_ARG_ENABLE(x509dir,
+              AC_HELP_STRING([--enable-x509dir=DIR],
+                             [directory containing X.509 certificates (default is determined by libeac)]),
+                             [x509dir="${enableval}"],
+                             [x509dir=false])
+if test "${x509dir}" = false ; then
+    x509dir="`$PKG_CONFIG libeac --variable=x509dir`"
+fi
+if test -z "${x509dir}"
+then
+    x509dir="`$PKG_CONFIG libeac --variable=x509dir`"
+fi
+if test -z "${x509dir}"
+then
+    AC_MSG_ERROR([use --enable-x509dir=DIR])
+fi
+X509DIR="${x509dir}"
+AC_SUBST(X509DIR)
+
+
+
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h memory.h stdint.h stdlib.h string.h sys/ioctl.h unistd.h])
@@ -155,9 +190,10 @@ EOF
 
 AC_CONFIG_FILES([
                  Makefile
+                 certs/Makefile
+                 doc/Makefile
                  m4/Makefile
                  src/Makefile
                  win32/Makefile
-                 doc/Makefile
                  ])
 AC_OUTPUT