diff --git a/src/libp11/Makefile.am b/src/libp11/Makefile.am
new file mode 100644
index 00000000..33bb2fdc
--- /dev/null
+++ b/src/libp11/Makefile.am
@@ -0,0 +1,17 @@
+# Process this file with automake to create Makefile.in
+
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = Makefile.mak
+
+lib_LTLIBRARIES = libp11.la
+
+libp11_la_SOURCES = p11_attr.c p11_cert.c p11_err.c p11_key.c \
+	p11_load.c p11_misc.c p11_rsa.c p11_slot.c
+
+libp11_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
+libp11_la_LIBADD = @LIBSCCONF@ ../scdl/libscdl.la @LIBDL@ @LIBCRYPTO@
+
+pkgconfigdir = @libdir@/pkgconfig
+pkgconfig_DATA = libp11.pc
+
diff --git a/src/libp11/Makefile.mak b/src/libp11/Makefile.mak
new file mode 100644
index 00000000..10dd93d3
--- /dev/null
+++ b/src/libp11/Makefile.mak
@@ -0,0 +1,14 @@
+TOPDIR = ..\..
+
+TARGET                  = libp11.dll
+
+OBJECTS                 = p11_attr.obj p11_cert.obj p11_err.obj \
+	p11_key.obj p11_load.obj p11_misc.obj p11_rsa.obj p11_slot.obj
+
+all: $(TARGET)
+
+!INCLUDE $(TOPDIR)\win32\Make.rules.mak
+
+$(TARGET): $(OBJECTS) ..\scdl\scdl.lib 
+	perl $(TOPDIR)\win32\makedef.pl $*.def $* $(OBJECTS)
+	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\scdl\scdl.lib $(OPENSSL_LIB)