diff --git a/configure.in b/configure.in
index 60c7ee37..de4975e4 100644
--- a/configure.in
+++ b/configure.in
@@ -706,22 +706,12 @@ AC_ARG_ENABLE(debug,
 CPPFLAGS="-I\${top_builddir}/src/include $CPPFLAGS"
 AM_CONDITIONAL(HAVE_BUNDLES, test "x$with_bundles" = "xyes")
 
-scldap_etc_path=`eval echo ${sysconfdir}` ; scldap_etc_path=`eval echo ${scldap_etc_path}`
-AC_DEFINE_UNQUOTED(SCLDAP_ETC_PATH, "$scldap_etc_path", [etc path for libscldap])
-scldap_conf_path=`eval echo ${scldap_etc_path}/scldap.conf`
-AC_DEFINE_UNQUOTED(SCLDAP_CONF_PATH, "$scldap_conf_path", [default config file for libscldap])
-
 opensc_etc_path=`eval echo ${sysconfdir}` ; opensc_etc_path=`eval echo ${opensc_etc_path}`
 AC_DEFINE_UNQUOTED(OPENSC_ETC_PATH, "$opensc_etc_path", [etc path for libopensc])
 opensc_conf_path=`eval echo ${opensc_etc_path}/opensc.conf`
 AC_DEFINE_UNQUOTED(OPENSC_CONF_PATH, "$opensc_conf_path", [default config file for libopensc])
 
 AC_SUBST(LIBSCCONF)
-LIBSCCONF="\${top_builddir}/src/scconf/libscconf.la"
-AC_SUBST(LIBSCLDAP)
-if test "x$LDAP_MSG" = "xyes" ; then
-  LIBSCLDAP="\${top_builddir}/src/scldap/libscldap.la"
-fi
 AC_SUBST(LIBOPENSC)
 LIBOPENSC="\${top_builddir}/src/libopensc/libopensc.la"
 
@@ -754,9 +744,7 @@ src/libopensc/Makefile
 src/libopensc/opensc-config
 src/libopensc/libopensc.pc
 src/libopensc/libpkcs15init.pc
-src/libopensc/libscam.pc
 src/libopensc/libscconf.pc
-src/libopensc/libscldap.pc
 src/openssh/Makefile
 src/pkcs11/Makefile
 src/pkcs11/rsaref/Makefile
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 42131b4e..0d540e22 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,10 +1,10 @@
 # Process this file with automake to create Makefile.in
 
 MAINTAINERCLEANFILES = Makefile.in
-DISTCLEANFILES = opensc.conf scldap.conf
-EXTRA_DIST = opensc.conf.in scldap.conf.in
+DISTCLEANFILES = opensc.conf 
+EXTRA_DIST = opensc.conf.in 
 
-noinst_DATA = opensc.conf.in scldap.conf.in opensc.conf scldap.conf
+noinst_DATA = opensc.conf.in opensc.conf 
 
 %: %.in
 	sed -e "s#PKGDATADIR#$(shell eval echo $(pkgdatadir))#" < $^ > $@
diff --git a/etc/scldap.conf.in b/etc/scldap.conf.in
deleted file mode 100644
index 853aa054..00000000
--- a/etc/scldap.conf.in
+++ /dev/null
@@ -1,94 +0,0 @@
-# Configuration file for OpenSC / scldap
-# Example configuration file
-
-ldap example {
-	# Hostname for LDAP server (required)
-	ldaphost = "ldap.foobar.tld";
-	# Port for LDAP server
-	ldapport = 389;
-	# Scope for ldap search
-	# 0 = LDAP_SCOPE_BASE
-	# 1 = LDAP_SCOPE_ONELEVEL
-	# 2 = LDAP_SCOPE_SUBTREE
-	scope = 2;
-	# Use the Distinguished Name to
-	# bind to the LDAP directory
-	binddn = "cn=public,dc=cc,dc=foobar,dc=tld";
-	# Use passwd as the password for simple authentication
-	passwd = "bazfoo";
-	# Use base as the starting point for the
-	# search instead of the default
-	base = "dc=foobar,dc=tld";
-	# Search attribute(s)
-	attributes = "cert", "user";
-	# Search filter. (required)
-	# formatted searches like (user=%s) are accepted
-	filter = "(identifier=foobarAuthority)";
-}
-
-# Test cards
-card "FINEID S4-1-1", "VRK-FINSIGN" {
-	ldap "auth certificate" {
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-		attributes = userCertificate;
-		filter = "(uniqueIdentifier=%s)";
-	}
-	ldap crl {
-		# unnecessary, data for crl is usually generated from
-		# auth cert's crlDistributionPoints 
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-	}
-	ldap "ca certificate" {
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-		attributes = cACertificate;
-		filter = "(objectClass=fineidCertificationAuthority)";
-	}
-	ldap "approx base" {
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-	}
-}
-
-card "FINEID S4-1", "VRK-FINSIGN" {
-	ldap "auth certificate" {
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-		attributes = userCertificate;
-		filter = "(uniqueIdentifier=%s)";
-	}
-	ldap crl {
-		# unnecessary, data for crl is usually generated from
-		# auth cert's crlDistributionPoints 
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-	}
-	ldap "ca certificate" {
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-		attributes = cACertificate;
-		filter = "(objectClass=fineidCertificationAuthority)";
-	}
-	ldap "approx base" {
-		ldaphost = ldap.example.com;
-		ldapport = 389;
-		scope = 2;
-		base = "dc=example,dc=com";
-	}
-}
diff --git a/src/libopensc/libscam.pc.in b/src/libopensc/libscam.pc.in
deleted file mode 100644
index f050bb98..00000000
--- a/src/libopensc/libscam.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libscam
-Description: libscam
-Version: @VERSION@
-Libs: -L${libdir} -lscam -lopensc
-Cflags: -I${includedir}
-
diff --git a/src/libopensc/libscldap.pc.in b/src/libopensc/libscldap.pc.in
deleted file mode 100644
index ef4ebef2..00000000
--- a/src/libopensc/libscldap.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libscldap
-Description: libscldap
-Version: @VERSION@
-Libs: -L${libdir} -lscldap -lscconf
-Cflags: -I${includedir}
-