diff --git a/Makefile.am b/Makefile.am
index b7cd72a5..4791f5b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,9 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
-SUBDIRS = . aclocal docs etc src
+SUBDIRS = . aclocal docs etc src win32
 
-EXTRA_DIST = CodingStyle README.signer bootstrap
+EXTRA_DIST = CodingStyle README.cards README.signer README.Win32 \
+	bootstrap depcomp Makefile.mak
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 acinclude.m4 \
 	config.guess config.h.in config.sub configure \
diff --git a/configure.in b/configure.in
index aebe181f..e46a7de2 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
 AC_INIT(src/libopensc/sc.c)
-AM_INIT_AUTOMAKE(opensc, CVS)
+AM_INIT_AUTOMAKE(opensc, 0.8.0-rc1)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -1150,6 +1150,7 @@ src/sslengine/Makefile
 src/tests/Makefile
 src/tools/Makefile
 src/usbtoken/Makefile
+win32/Makefile
 ])
 
 if test ! -z "$RANDOM_POOL" ; then
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1bca9a9b..188ee93c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -26,7 +26,7 @@ man_MANS	= pkcs15-crypt.1 \
 		  sc_release_context.3 \
 		  sc_select_file.3
 EXTRA_DIST	= $(man_MANS) pkcs15-profile.5.in pkcs-15v1_1.asn \
-	     	  usbtoken.xml usbtoken.html
+	     	  usbtoken.xml usbtoken.html doxygen.conf
 
 STYLESHEET=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/docbook.xsl
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 18d59dc0..f50a0665 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,4 +5,6 @@ MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = Makefile.mak
 
 # Order IS important
-SUBDIRS = common include scconf scldap scrandom assuan libopensc pkcs15init pkcs11 tests tools openssh scam pam sia signer usbtoken sslengine
+SUBDIRS = common include scconf scldap scrandom assuan libopensc \
+	pkcs15init pkcs11 tests tools openssh scam pam sia signer \
+	usbtoken sslengine
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 42b9ef7e..7394da0d 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -2,4 +2,6 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
+EXTRA_DIST = Makefile.mak winconfig.h
+
 SUBDIRS = . opensc
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index fcbee17e..71d8d6c5 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -5,7 +5,7 @@ includedir = ${prefix}/include/opensc
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = Makefile.mak libopensc.pc.in \
-	     reader-pcsc.c reader-openct.c reader-usbtoken.c
+	     reader-pcsc.c reader-openct.c reader-usbtoken.c emv.c
 
 if HAVE_SSL
 SSL_LIB = @LIBCRYPTO@
diff --git a/src/openscd/Makefile.am b/src/openscd/Makefile.am
index 3b5d61d0..549333a1 100644
--- a/src/openscd/Makefile.am
+++ b/src/openscd/Makefile.am
@@ -2,10 +2,12 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
+EXTRA_DIST = test.c
+
 INCLUDES = @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 noinst_PROGRAMS = openscd
 
-openscd_SOURCES = openscd.c commands.c mkdtemp.c
+openscd_SOURCES = openscd.c commands.c mkdtemp.c openscd.h
 openscd_LDADD = @GETOPTSRC@ ../assuan/libassuan.a ../scrandom/libscrandom.a
diff --git a/src/openscd/openscd.c b/src/openscd/openscd.c
index b1fad753..90ba2b34 100644
--- a/src/openscd/openscd.c
+++ b/src/openscd/openscd.c
@@ -7,8 +7,9 @@
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
 
-#include <assuan.h>
+#include "../assuan/assuan.h"
 #include "../libopensc/opensc.h"
 #include "../libopensc/pkcs15.h"
 #include <stdarg.h>
diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
index 17edf507..bd58f247 100644
--- a/src/pkcs11/Makefile.am
+++ b/src/pkcs11/Makefile.am
@@ -4,6 +4,8 @@ libdir = @libdir@/pkcs11
 
 MAINTAINERCLEANFILES = Makefile.in
 
+EXTRA_DIST = Makefile.mak opensc_pkcs11_install.js
+
 SUBDIRS = . rsaref
 
 INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am
index ad3790de..32f9aec0 100644
--- a/src/pkcs15init/Makefile.am
+++ b/src/pkcs15init/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 EXTRA_DIST = flex.profile gpk.profile miocos.profile etoken.profile \
-	     pkcs15.profile
+	     pkcs15.profile Makefile.mak
 
 lib_LTLIBRARIES	= libpkcs15init.la
 
diff --git a/src/scconf/Makefile.am b/src/scconf/Makefile.am
index ce44d039..fa457492 100644
--- a/src/scconf/Makefile.am
+++ b/src/scconf/Makefile.am
@@ -4,7 +4,7 @@ includedir = ${prefix}/include/opensc
 
 MAINTAINERCLEANFILES = Makefile.in lex-parse.c
 
-EXTRA_DIST = Makefile.am
+EXTRA_DIST = Makefile.mak
 
 include_HEADERS = scconf.h
 noinst_HEADERS = internal.h
diff --git a/src/scrandom/Makefile.am b/src/scrandom/Makefile.am
index 3c094160..64f52236 100644
--- a/src/scrandom/Makefile.am
+++ b/src/scrandom/Makefile.am
@@ -4,6 +4,8 @@ includedir = ${prefix}/include/opensc
 
 MAINTAINERCLEANFILES = Makefile.in
 
+EXTRA_DIST = Makefile.mak
+
 include_HEADERS = scrandom.h
 
 if HAVE_SSL
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1639e8f7..88c9ff46 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,6 +2,10 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
+EXTRA_DIST = Makefile.mak regression/README regression/crypt0001 \
+	     regression/crypt0002 regression/crypt0003 regression/crypt0004 \
+	     regression/functions
+
 INCLUDES = @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@