diff --git a/Makefile.am b/Makefile.am
index 7f795ea6..92c16735 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,15 @@
+# Process this file with automake to create Makefile.in
+
 SUBDIRS = . aclocal docs etc src win32
 
 EXTRA_DIST = CodingStyle bootstrap Makefile.mak depcomp
 
-MAINTAINERCLEANFILES = Makefile.in config.h.in configure \
-		install-sh ltmain.sh missing mkinstalldirs \
-		compile depcomp config.log config.status \
-		config.guess config.sub acinclude.m4 aclocal.m4
+MAINTAINERCLEANFILES = \
+Makefile.in config.h.in configure \
+install-sh ltmain.sh missing mkinstalldirs \
+compile depcomp config.log config.status \
+config.guess config.sub acinclude.m4 aclocal.m4
 
-DEPCLEANFILES = config.log configure 
+DEPCLEANFILES = config.log configure
 
-AUTOMAKE_OPTIONS=foreign
+AUTOMAKE_OPTIONS = foreign
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a21eda8e..7c54d05f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,40 +1,42 @@
 # Process this file with automake to create Makefile.in
 
-XSLTPROC := @XSLTPROC@
-HTMLFILES := usbtoken.html opensc.html opensc.css
-XMLFILES := usbtoken.xml opensc.xml opensc.xsl
+XSLTPROC = @XSLTPROC@
+HTMLFILES = usbtoken.html opensc.html opensc.css
+XMLFILES = usbtoken.xml opensc.xml opensc.xsl
 
 MAINTAINERCLEANFILES = Makefile.in pkcs15-profile.5
 
-MANSRC  	= pkcs15-crypt.1 \
-	   	  pkcs15-init.1 \
-		  cryptoflex-tool.1 \
-		  opensc-config.1 \
-		  opensc-explorer.1 \
-		  opensc-tool.1 \
-		  pkcs15-tool.1 \
-		  opensc.7 \
-		  pkcs15.7 \
-		  sc_connect_card.3 \
-		  sc_detect_card_presence.3 \
-		  sc_disconnect_card.3 \
-		  sc_establish_context.3 \
-		  sc_file.3 \
-		  sc_file_free.3 \
-		  sc_file_new.3 \
-		  sc_list_files.3 \
-		  sc_lock.3 \
-		  sc_read_binary.3 \
-		  sc_read_record.3 \
-		  sc_release_context.3 \
-		  sc_select_file.3 \
-		  sc_pkcs15_compute_signature.3
-man_MANS	= $(MANSRC) pkcs15-profile.5
-noinst_DATA	= $(HTMLFILES)
-EXTRA_DIST	= $(MANSRC) pkcs15-profile.5.in pkcs-15v1_1.asn \
-	     	  $(XMLFILES) $(HTMLFILES) doxygen.conf
+MANSRC = \
+pkcs15-crypt.1 \
+pkcs15-init.1 \
+cryptoflex-tool.1 \
+opensc-config.1 \
+opensc-explorer.1 \
+opensc-tool.1 \
+pkcs15-tool.1 \
+opensc.7 \
+pkcs15.7 \
+sc_connect_card.3 \
+sc_detect_card_presence.3 \
+sc_disconnect_card.3 \
+sc_establish_context.3 \
+sc_file.3 \
+sc_file_free.3 \
+sc_file_new.3 \
+sc_list_files.3 \
+sc_lock.3 \
+sc_read_binary.3 \
+sc_read_record.3 \
+sc_release_context.3 \
+sc_select_file.3 \
+sc_pkcs15_compute_signature.3
 
-STYLESHEET=opensc.xsl
+man_MANS = $(MANSRC) pkcs15-profile.5
+noinst_DATA = $(HTMLFILES)
+EXTRA_DIST = $(MANSRC) pkcs15-profile.5.in pkcs-15v1_1.asn \
+	$(XMLFILES) $(HTMLFILES) doxygen.conf
+
+STYLESHEET = opensc.xsl
 
 %.html: %.xml
 if HAVE_DOCBOOK
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 2b39b4c9..7c71250d 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -3,4 +3,4 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = opensc.conf.example scldap.conf.example
-pkgdata_DATA = opensc.conf.example scldap.conf.example
+pkgdata_DATA = $(EXTRA_DIST)
diff --git a/src/include/opensc/Makefile.am b/src/include/opensc/Makefile.am
index 051da2a9..2268c7e4 100644
--- a/src/include/opensc/Makefile.am
+++ b/src/include/opensc/Makefile.am
@@ -2,22 +2,23 @@
 
 RM = rm -f
 
-SUBDIRS = rsaref
+SUBDIRS = . rsaref
 
-MAINTAINERCLEANFILES = Makefile.in 
-DISTCLEANFILES= asn1.h \
-	cardctl.h \
-	emv.h \
-	log.h \
-	opensc.h \
-	errors.h \
-	types.h \
-	pkcs11.h \
-	pkcs15.h \
-	pkcs15-init.h \
-	scconf.h \
-	scldap.h \
-	scrandom.h
+MAINTAINERCLEANFILES = Makefile.in
+DISTCLEANFILES = \
+asn1.h \
+cardctl.h \
+emv.h \
+log.h \
+opensc.h \
+errors.h \
+types.h \
+pkcs11.h \
+pkcs15.h \
+pkcs15-init.h \
+scconf.h \
+scldap.h \
+scrandom.h
 
 all-local:
 	@$(RM) *.h
@@ -34,4 +35,3 @@ all-local:
 	@$(LN_S) ${top_srcdir}/src/scconf/scconf.h scconf.h
 	@$(LN_S) ${top_srcdir}/src/scldap/scldap.h scldap.h
 	@$(LN_S) ${top_srcdir}/src/scrandom/scrandom.h scrandom.h
-
diff --git a/src/include/opensc/rsaref/Makefile.am b/src/include/opensc/rsaref/Makefile.am
index 9bc1da97..fbee0750 100644
--- a/src/include/opensc/rsaref/Makefile.am
+++ b/src/include/opensc/rsaref/Makefile.am
@@ -2,12 +2,13 @@
 
 RM = rm -f
 
-MAINTAINERCLEANFILES = Makefile.in 
-DISTCLEANFILES= pkcs11.h \
-	pkcs11f.h \
-	pkcs11t.h \
-	unix.h \
-	win32.h
+MAINTAINERCLEANFILES = Makefile.in
+DISTCLEANFILES = \
+pkcs11.h \
+pkcs11f.h \
+pkcs11t.h \
+unix.h \
+win32.h
 
 all-local:
 	@$(RM) *.h
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index 93f1c60d..d88d2887 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -1,11 +1,11 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
+# Process this file with automake to create Makefile.in
 
 includedir = ${prefix}/include/opensc
 
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = Makefile.mak libopensc.pc.in \
-	     reader-pcsc.c reader-openct.c reader-usbtoken.c emv.c
+	reader-pcsc.c reader-openct.c reader-usbtoken.c emv.c
 
 if HAVE_SSL
 SSL_LIB = @LIBCRYPTO@
@@ -26,30 +26,33 @@ OPENCT_SRC = reader-openct.c
 endif
 
 INCLUDES = $(PCSC_FLAGS) @OPENCT_CFLAGS@
+LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
 
 bin_SCRIPTS = opensc-config
 
-lib_LTLIBRARIES		= libopensc.la
-libopensc_la_SOURCES	= sc.c ctx.c module.c asn1.c log.c base64.c \
-			  errors.c sec.c card.c iso7816.c dir.c \
-			  portability.c padding.c \
-			  pkcs15.c pkcs15-cert.c pkcs15-data.c pkcs15-pin.c \
-			  pkcs15-prkey.c pkcs15-pubkey.c pkcs15-sec.c \
-			  pkcs15-wrap.c pkcs15-algo.c \
-			  pkcs15-cache.c $(PCSC_SRC) reader-ctapi.c \
-			  $(USBTOKEN_SRC) $(OPENCT_SRC) ctbcs.c \
-			  card-setcos.c card-miocos.c card-flex.c card-gpk.c \
-			  card-etoken.c card-tcos.c card-emv.c card-default.c \
-			  card-mcrd.c card-starcos.c
+lib_LTLIBRARIES = libopensc.la
+libopensc_la_SOURCES = \
+	sc.c ctx.c module.c asn1.c log.c base64.c \
+	errors.c sec.c card.c iso7816.c dir.c \
+	portability.c padding.c \
+	pkcs15.c pkcs15-cert.c pkcs15-data.c pkcs15-pin.c \
+	pkcs15-prkey.c pkcs15-pubkey.c pkcs15-sec.c \
+	pkcs15-wrap.c pkcs15-algo.c \
+	pkcs15-cache.c $(PCSC_SRC) reader-ctapi.c \
+	$(USBTOKEN_SRC) $(OPENCT_SRC) ctbcs.c \
+	card-setcos.c card-miocos.c card-flex.c card-gpk.c \
+	card-etoken.c card-tcos.c card-emv.c card-default.c \
+	card-mcrd.c card-starcos.c
 
-libopensc_la_LDFLAGS	= -version-info 0:6:0 @OPENCT_LDFLAGS@
-libopensc_la_LIBADD	= @LIBDL@ @OPENCT_LIBS@ $(PCSC_LIB) $(SSL_LIB) $(LIBSCCONF)
+libopensc_la_LDFLAGS = -version-info 0:6:0
+libopensc_la_LIBADD = @LIBDL@ @OPENCT_LIBS@ $(PCSC_LIB) $(SSL_LIB) $(LIBSCCONF)
 
-include_HEADERS		= opensc.h pkcs15.h emv.h \
-			  errors.h types.h \
-			  cardctl.h asn1.h log.h
-noinst_HEADERS		= ctbcs.h internal.h
+include_HEADERS = \
+	opensc.h pkcs15.h emv.h \
+	errors.h types.h \
+	cardctl.h asn1.h log.h
+
+noinst_HEADERS = ctbcs.h internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libopensc.pc
-
diff --git a/src/openssh/Makefile.am b/src/openssh/Makefile.am
index a1525557..546e0987 100644
--- a/src/openssh/Makefile.am
+++ b/src/openssh/Makefile.am
@@ -2,4 +2,4 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST= openssh-3.6.1p2.diff openssh-3.6.1p2.README
+EXTRA_DIST = openssh-3.6.1p2.diff openssh-3.6.1p2.README
diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
index cf6f007e..2ab05fc5 100644
--- a/src/pkcs11/Makefile.am
+++ b/src/pkcs11/Makefile.am
@@ -10,11 +10,9 @@ SUBDIRS = . rsaref
 
 INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
 
-
 SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
-        mechanism.c openssl.c \
-	secretkey.c framework-pkcs15.c framework-pkcs15init.c \
-	debug.c
+	mechanism.c openssl.c secretkey.c framework-pkcs15.c \
+	framework-pkcs15init.c debug.c
 INC = sc-pkcs11.h
 
 lib_LTLIBRARIES = opensc-pkcs11.la libpkcs11.la
@@ -22,14 +20,12 @@ lib_LTLIBRARIES = opensc-pkcs11.la libpkcs11.la
 opensc_pkcs11_la_SOURCES = $(SRC) $(INC)
 opensc_pkcs11_la_LDFLAGS = -module -avoid-version
 opensc_pkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
-			 ../pkcs15init/libpkcs15init.la \
-			 ../scrandom/libscrandom.la
+	../pkcs15init/libpkcs15init.la ../scrandom/libscrandom.la
 
-libpkcs11_la_SOURCES = libpkcs11.c 
+libpkcs11_la_SOURCES = libpkcs11.c
 libpkcs11_la_LDFLAGS = -version-info 0:6:0
 libpkcs11_la_LIBADD = @LIBDL@ @LIBOPENSC@ \
-			 ../pkcs15init/libpkcs15init.la \
-			 ../scrandom/libscrandom.la
+	../pkcs15init/libpkcs15init.la ../scrandom/libscrandom.la
 
 openscdir=@includedir@/opensc
 opensc_HEADERS = pkcs11.h
diff --git a/src/pkcs11/rsaref/Makefile.am b/src/pkcs11/rsaref/Makefile.am
index c8dc6bec..01eabbda 100644
--- a/src/pkcs11/rsaref/Makefile.am
+++ b/src/pkcs11/rsaref/Makefile.am
@@ -2,9 +2,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-includedir= @includedir@/opensc/rsaref
+includedir = @includedir@/opensc/rsaref
 
-include_HEADERS = pkcs11.h pkcs11f.h pkcs11t.h 
+include_HEADERS = pkcs11.h pkcs11f.h pkcs11t.h
 noinst_HEADERS = unix.h win32.h
-
-
diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am
index 0468d573..30755ff8 100644
--- a/src/pkcs15init/Makefile.am
+++ b/src/pkcs15init/Makefile.am
@@ -7,16 +7,23 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
-PROFILES = flex.profile flex_so.profile flex_onepin.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
+lib_LTLIBRARIES = libpkcs15init.la
 
 libpkcs15init_la_SOURCES = \
-		  pkcs15-lib.c profile.c \
-		  pkcs15-gpk.c pkcs15-miocos.c pkcs15-cflex.c \
-		  pkcs15-etoken.c
+	pkcs15-lib.c profile.c \
+	pkcs15-gpk.c pkcs15-miocos.c pkcs15-cflex.c \
+	pkcs15-etoken.c
 
 include_HEADERS = pkcs15-init.h
 noinst_HEADERS = profile.h
diff --git a/src/scam/Makefile.am b/src/scam/Makefile.am
index 93677a05..6edfc4b5 100644
--- a/src/scam/Makefile.am
+++ b/src/scam/Makefile.am
@@ -2,7 +2,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
+INCLUDES = @CFLAGS_OPENSC@
 
 lib_LTLIBRARIES = libscam.la
 
@@ -13,11 +13,9 @@ if HAVE_SSL
 SSL_LIB = @LIBCRYPTO@
 endif
 
-
 SRC = scam.c scam.h p15_eid.c p15_ldap.c
 
 libscam_la_SOURCES = $(SRC)
 libscam_la_LDFLAGS = -module -avoid-version
 libscam_la_LIBADD = @LIBOPENSC@ $(LDAP_LIB) $(SSL_LIB) \
-		    	../scrandom/libscrandom.la 
-libscam_la_CFLAGS = $(EXTRAINC)
+	../scrandom/libscrandom.la
diff --git a/src/scrandom/Makefile.am b/src/scrandom/Makefile.am
index b0281946..472b7137 100644
--- a/src/scrandom/Makefile.am
+++ b/src/scrandom/Makefile.am
@@ -11,9 +11,9 @@ SSL_LIB = @LIBCRYPTO@
 endif
 
 noinst_LTLIBRARIES = libscrandom.la
-libscrandom_la_SOURCES=scrandom.c scrandom.h
+libscrandom_la_SOURCES = scrandom.c scrandom.h
 
 noinst_PROGRAMS = test-random
 
-test_random_SOURCES = test-random.c 
+test_random_SOURCES = test-random.c
 test_random_LDADD = $(SSL_LIB) libscrandom.la
diff --git a/src/signer/Makefile.am b/src/signer/Makefile.am
index 5b3d4ce4..677237a5 100644
--- a/src/signer/Makefile.am
+++ b/src/signer/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
+# Process this file with automake to create Makefile.in
 
 plugindir = $(PLUGINDIR)
 openscdir = @libdir@/opensc
@@ -20,12 +20,10 @@ endif
 opensc_signer_la_LDFLAGS = -module -avoid-version
 opensc_signer_la_LIBADD = @LIBOPENSC@ @LIBCRYPTO@ @LIBASSUAN@
 opensc_signer_la_CFLAGS = $(AM_CFLAGS) -Inpinclude -DXP_UNIX
-opensc_signer_la_SOURCES = opensc-crypto.c opensc-support.c \
-			   signer.c stubs.c dialog.c
-noinst_HEADERS		 = opensc-crypto.h opensc-support.h \
-			   signer.h npinclude/jri.h npinclude/jri_md.h \
-			   npinclude/jritypes.h npinclude/npapi.h \
-			   npinclude/npupp.h npinclude/npunix.c
+opensc_signer_la_SOURCES = \
+	opensc-crypto.c opensc-support.c signer.c stubs.c dialog.c
+noinst_HEADERS		 = \
+	opensc-crypto.h opensc-support.h signer.h 
 
 install-exec-local: install-openscLTLIBRARIES
 	-$(LN_S) -f $(openscdir)/opensc-signer.so $(DESTDIR)$(plugindir)/
diff --git a/src/signer/npinclude/Makefile.am b/src/signer/npinclude/Makefile.am
index ed6c44ab..b58f6ac3 100644
--- a/src/signer/npinclude/Makefile.am
+++ b/src/signer/npinclude/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
+# Process this file with automake to create Makefile.in
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/sslengines/Makefile.am b/src/sslengines/Makefile.am
index d89c0955..2f2cf255 100644
--- a/src/sslengines/Makefile.am
+++ b/src/sslengines/Makefile.am
@@ -1,23 +1,31 @@
-libdir  = @libdir@/opensc
+# Process this file with automake to create Makefile.in
+
+libdir = @libdir@/opensc
 
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = Makefile.mak engine_pkcs11.def $(engine_pkcs11_la_SOURCES) \
-	     $(engine_opensc_la_SOURCES) test_engine.sh
+EXTRA_DIST = Makefile.mak engine_pkcs11.def test_engine.sh \
+	$(engine_opensc_la_SOURCES) $(engine_pkcs11_la_SOURCES) 
 
 if HAVE_ENGINE
-lib_LTLIBRARIES=engine_opensc.la engine_pkcs11.la
+lib_LTLIBRARIES = engine_opensc.la engine_pkcs11.la
 endif
 
-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 
+OPENSSL_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
 
-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/libpkcs11.la 
-engine_pkcs11_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version 
+engine_opensc_la_SOURCES = hw_opensc.c engine_opensc.c engine_opensc.h
+engine_opensc_la_CFLAGS = $(OPENSSL_CFLAGS) @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 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 = $(OPENSSL_CFLAGS) @CFLAGS_OPENSC@
+engine_pkcs11_la_LIBADD = @LIBCRYPTOA@ ../pkcs11/libpkcs11.la
+engine_pkcs11_la_LDFLAGS = -Wl,-Bsymbolic -module -avoid-version
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 747ddced..e8bdcdac 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,9 +2,9 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS=regression
+SUBDIRS = . regression
 
-EXTRA_DIST = Makefile.mak 
+EXTRA_DIST = Makefile.mak
 
 INCLUDES = @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@
diff --git a/src/tests/regression/Makefile.am b/src/tests/regression/Makefile.am
index 30841760..83a449a3 100644
--- a/src/tests/regression/Makefile.am
+++ b/src/tests/regression/Makefile.am
@@ -1,7 +1,9 @@
+# Process this file with automake to create Makefile.in
+
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST= crypt0001 crypt0002 crypt0003 crypt0004 erase \
-	functions init0001 init0002 init0003 init0004 init0005 \
-	init0006 init0007 init0008 init0009 init0010 init0011 \
-	README run-all test.p12
-
+EXTRA_DIST = \
+crypt0001 crypt0002 crypt0003 crypt0004 \
+init0001 init0002 init0003 init0004 init0005 init0006 \
+init0007 init0008 init0009 init0010 init0011 \
+erase functions README run-all test.p12
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 8bd79951..771ff259 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -12,8 +12,8 @@ PROGRAMS_SSL = cryptoflex-tool pkcs15-init
 endif
 
 bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \
-	       pkcs11-tool cardos-info \
-	       $(PROGRAMS_SSL)
+	pkcs11-tool cardos-info \
+	$(PROGRAMS_SSL)
 
 opensc_tool_SOURCES = opensc-tool.c util.c
 opensc_tool_LDADD = @GETOPTSRC@
diff --git a/src/usbtoken/Makefile.am b/src/usbtoken/Makefile.am
index b489302c..ea75b889 100644
--- a/src/usbtoken/Makefile.am
+++ b/src/usbtoken/Makefile.am
@@ -1,11 +1,12 @@
 # Process this file with automake to create Makefile.in
+
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST=DEPRECATED
+EXTRA_DIST = DEPRECATED
 
 if HAVE_USBTOKEN
 sbin_PROGRAMS = usbtoken
 endif
 
-usbtoken_SOURCES= atr.c eutron.c etoken.c ikey2k.c ikey3k.c main.c pid.c \
-		  socket.c t1.c usb.c usbtoken.h
-#usbtoken_CFLAGS= -DUSB_DEBUG
+usbtoken_SOURCES = atr.c eutron.c etoken.c ikey2k.c ikey3k.c main.c pid.c \
+	socket.c t1.c usb.c usbtoken.h
+#usbtoken_CFLAGS = -DUSB_DEBUG
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 9cecab26..13a3e892 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,3 +1,5 @@
+# Process this file with automake to create Makefile.in
+
 EXTRA_DIST = Make.rules.mak makedef.pl
 
 MAINTAINERCLEANFILES = Makefile.in