diff --git a/configure.in b/configure.in
index 3a701b24..15cd9035 100644
--- a/configure.in
+++ b/configure.in
@@ -763,9 +763,6 @@ src/scconf/Makefile
 src/scdl/Makefile
 src/signer/Makefile
 src/signer/npinclude/Makefile
-src/libp11/Makefile
-src/libp11/libp11.pc
-src/sslengines/Makefile
 src/tests/Makefile
 src/tests/regression/Makefile
 src/tools/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c9231f5b..db155c4f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,4 +6,4 @@ EXTRA_DIST = Makefile.mak
 
 # Order IS important
 SUBDIRS = common include scconf scdl libopensc pkcs15init pkcs11 \
-	tests tools openssh signer libp11 sslengines
+	tests tools openssh signer 
diff --git a/src/Makefile.mak b/src/Makefile.mak
index c3d285ff..af89ed89 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -2,7 +2,7 @@ TOPDIR = ..
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-SUBDIRS = include common scconf scdl libopensc tests pkcs15init pkcs11 tools $(LIBP11_DIR) $(OPENSSL_ENGINES_DIR)
+SUBDIRS = include common scconf scdl libopensc tests pkcs15init pkcs11 tools
 
 all::
 
diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 05ed1ed4..1a2d9a41 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -9,8 +9,6 @@
 !IF "$(OPENSSL_DEF)" == "/DHAVE_OPENSSL"
 OPENSSL_INCL_DIR = /IC:\openssl\include
 OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
-LIBP11_DIR = libp11
-OPENSSL_ENGINES_DIR = sslengines
 PKCS15_INIT = pkcs15-init.exe
 !ENDIF