diff --git a/configure.in b/configure.in
index b0c8de06..4dcba0a3 100644
--- a/configure.in
+++ b/configure.in
@@ -1190,7 +1190,9 @@ src/signer/Makefile
 src/signer/npinclude/Makefile
 src/sslengines/Makefile
 src/tests/Makefile
+src/tests/regression/Makefile
 src/tools/Makefile
+src/tools/pkcs15-init.sh
 src/usbtoken/Makefile
 tools/Makefile
 win32/Makefile
diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am
index 84763336..0468d573 100644
--- a/src/pkcs15init/Makefile.am
+++ b/src/pkcs15init/Makefile.am
@@ -7,8 +7,8 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
-PROFILES = flex.profile flex_so.profile gpk.profile miocos.profile \
-	   etoken.profile pkcs15.profile
+PROFILES = flex.profile flex_so.profile flex_onepin.profile gpk.profile \
+	   miocos.profile etoken.profile pkcs15.profile
 EXTRA_DIST = $(PROFILES) Makefile.mak
 
 lib_LTLIBRARIES	= libpkcs15init.la
diff --git a/src/sslengines/Makefile.am b/src/sslengines/Makefile.am
index ae590f44..ec865c55 100644
--- a/src/sslengines/Makefile.am
+++ b/src/sslengines/Makefile.am
@@ -2,24 +2,22 @@ libdir  = @libdir@/opensc
 
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = engine_opensc.c engine_opensc.h engine_pkcs11.c \
-	     engine_pkcs11.h hw_opensc.c hw_pkcs11.c libpkcs11.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 \
-             test_engine.s
+EXTRA_DIST = Makefile.mak engine_pkcs11.def $(engine_pkcs11_la_SOURCES) \
+	     $(engine_opensc_la_SOURCES) test_engine.s
 
 if HAVE_ENGINE
 lib_LTLIBRARIES=engine_opensc.la engine_pkcs11.la
 endif
 
-engine_opensc_la_SOURCES = hw_opensc.c engine_opensc.c  
+engine_opensc_la_SOURCES = hw_opensc.c engine_opensc.c  engine_opensc.h
 engine_opensc_la_CFLAGS =  -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DL_ENDIAN -DTERMIO -DENGINE_DYNAMIC_SUPPORT -DSHA1_ASM -DMD5_ASM -DRMD160_ASM @CFLAGS_OPENSC@
 engine_opensc_la_LIBADD = @LIBCRYPTOA@ @LIBOPENSC@ 
 engine_opensc_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version 
 
-engine_pkcs11_la_SOURCES = hw_pkcs11.c engine_pkcs11.c \
-			   p11_attr.c p11_cert.c p11_err.c p11_key.c p11_load.c p11_misc.c \
- 	     		   p11_rsa.c p11_slot.c
+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 libpkcs11.h
 engine_pkcs11_la_CFLAGS = -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_KRB5 -DL_ENDIAN -DTERMIO -DENGINE_DYNAMIC_SUPPORT -DSHA1_ASM -DMD5_ASM -DRMD160_ASM @CFLAGS_OPENSC@
 engine_pkcs11_la_LIBADD = @LIBCRYPTOA@ ../pkcs11/.libs/libpkcs11.a 
 engine_pkcs11_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 88c9ff46..747ddced 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,9 +2,9 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = Makefile.mak regression/README regression/crypt0001 \
-	     regression/crypt0002 regression/crypt0003 regression/crypt0004 \
-	     regression/functions
+SUBDIRS=regression
+
+EXTRA_DIST = Makefile.mak 
 
 INCLUDES = @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@