diff --git a/src/Makefile.am b/src/Makefile.am
index 30a3d786..047304fb 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 scldap scrandom libopensc pkcs15init pkcs11 \
-	tests tools openssh scam pam sia signer sslengines
+	tests tools openssh scam pam sia signer libp11 sslengines
diff --git a/src/Makefile.mak b/src/Makefile.mak
index 1e2c42b6..eae48531 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 scrandom pkcs15init pkcs11 tools $(OPENSSL_ENGINES_DIR)
+SUBDIRS = include common scconf scdl libopensc tests scrandom pkcs15init pkcs11 tools libp11 $(OPENSSL_ENGINES_DIR)
 
 all::
 
diff --git a/src/sslengines/p11_attr.c b/src/libp11/p11_attr.c
similarity index 100%
rename from src/sslengines/p11_attr.c
rename to src/libp11/p11_attr.c
diff --git a/src/sslengines/p11_cert.c b/src/libp11/p11_cert.c
similarity index 100%
rename from src/sslengines/p11_cert.c
rename to src/libp11/p11_cert.c
diff --git a/src/sslengines/p11_err.c b/src/libp11/p11_err.c
similarity index 100%
rename from src/sslengines/p11_err.c
rename to src/libp11/p11_err.c
diff --git a/src/sslengines/p11_key.c b/src/libp11/p11_key.c
similarity index 100%
rename from src/sslengines/p11_key.c
rename to src/libp11/p11_key.c
diff --git a/src/sslengines/p11_load.c b/src/libp11/p11_load.c
similarity index 100%
rename from src/sslengines/p11_load.c
rename to src/libp11/p11_load.c
diff --git a/src/sslengines/p11_misc.c b/src/libp11/p11_misc.c
similarity index 100%
rename from src/sslengines/p11_misc.c
rename to src/libp11/p11_misc.c
diff --git a/src/sslengines/p11_rsa.c b/src/libp11/p11_rsa.c
similarity index 100%
rename from src/sslengines/p11_rsa.c
rename to src/libp11/p11_rsa.c
diff --git a/src/sslengines/p11_slot.c b/src/libp11/p11_slot.c
similarity index 100%
rename from src/sslengines/p11_slot.c
rename to src/libp11/p11_slot.c
diff --git a/src/sslengines/Makefile.am b/src/sslengines/Makefile.am
index 589751d8..3512280b 100644
--- a/src/sslengines/Makefile.am
+++ b/src/sslengines/Makefile.am
@@ -24,11 +24,9 @@ engine_opensc_la_LDFLAGS = @OPENSSL_LDFLAGS@ -module -avoid-version
 
 engine_pkcs11_la_SOURCES = \
 	hw_pkcs11.c engine_pkcs11.c engine_pkcs11.h \
-	p11_attr.c p11_cert.c p11_err.c p11_key.c \
-	p11_load.c p11_misc.c p11_rsa.c p11_slot.c \
 	pkcs11-internal.h
 engine_pkcs11_la_CFLAGS = $(OPENSSL_CFLAGS)
-engine_pkcs11_la_LIBADD = @ENGINE_LINK@ ../pkcs11/libpkcs11.la
+engine_pkcs11_la_LIBADD = @ENGINE_LINK@ ../pkcs11/libpkcs11.la ../libp11/libp11.la
 engine_pkcs11_la_LDFLAGS = @OPENSSL_LDFLAGS@ -module -avoid-version
 
 install-exec-local: install-engineLTLIBRARIES