diff --git a/npa/Makefile.am b/npa/Makefile.am
index 51779ca..4e81d81 100644
--- a/npa/Makefile.am
+++ b/npa/Makefile.am
@@ -51,13 +51,30 @@ $(opensc_root)/lib/libnpa.la: $(opensc_root)/lib/libopensc.la
 		--program-prefix='' \
 		PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \
 		PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \
-		OPENSC_LIBS="-L$(opensc_root)/lib -lopensc"
-	make install DESTDIR="$(opensc_root)"
+		OPENSC_LIBS="-L$(opensc_root)/lib -lopensc" || ($(restore_la) && false)
+	make install DESTDIR="$(opensc_root)" || ($(restore_la) && false)
 	$(restore_la)
 
 win-opensc: $(opensc_root)/lib/libopensc.la
 
 win: $(opensc_root)/lib/libnpa.la
+	mkdir -p npa-win32
+	for i in \
+		$(opensc_root)/bin/*npa*.dll \
+		$(opensc_root)/bin/*opensc*.dll \
+		$(opensc_root)/bin/*eay*.dll \
+		$(opensc_root)/bin/*ltdl*.dll \
+		$(opensc_root)/bin/*zlib*.dll \
+		$(opensc_root)/bin/npa-tool.exe \
+		; do cp $${i} npa-win32; done
+	mkdir -p npa-win32/include
+	for i in \
+		$(opensc_root)/include/openssl \
+		$(opensc_root)/include/npa \
+		; do cp -r $${i} npa-win32/include; done
+	mkdir -p npa-win32/include/libopensc
+	cp $(srcdir)/src/opensc/src/libopensc/*.h npa-win32/include/libopensc
+	rm -f npa-win32/*pkcs* npa-win32/include/libopensc/*internal*.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnpa.pc
diff --git a/npa/configure.ac b/npa/configure.ac
index cbd145e..bbbe56f 100644
--- a/npa/configure.ac
+++ b/npa/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([nPA smart card library], [0.4], [http://sourceforge.net/projects/vsmartcard/support], [npa], [http://sourceforge.net/projects/vsmartcard/])
+AC_INIT([nPA Smart Card Library], [0.4], [http://sourceforge.net/projects/vsmartcard/support], [npa], [http://sourceforge.net/projects/vsmartcard/])
 AC_CONFIG_SRCDIR([src/npa.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])