diff --git a/Makefile.am b/Makefile.am
index 3baf089f..b7cd72a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ EXTRA_DIST = CodingStyle README.signer bootstrap
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 acinclude.m4 \
 	config.guess config.h.in config.sub configure \
-	install-sh ltmain.sh missing mkinstalldirs ylwrap
+	install-sh ltmain.sh missing mkinstalldirs ylwrap \
+	compile config.log config.status depcomp
 
 # require automake 1.5
 AUTOMAKE_OPTIONS = 1.5
diff --git a/src/include/opensc/Makefile.am b/src/include/opensc/Makefile.am
index 952c139d..63fa8077 100644
--- a/src/include/opensc/Makefile.am
+++ b/src/include/opensc/Makefile.am
@@ -12,6 +12,7 @@ MAINTAINERCLEANFILES = Makefile.in \
 	opensc.h \
 	errors.h \
 	types.h \
+	pkcs11.h \
 	pkcs15.h \
 	pkcs15-init.h \
 	scconf.h \
diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am
index 6b03d688..ad3790de 100644
--- a/src/pkcs15init/Makefile.am
+++ b/src/pkcs15init/Makefile.am
@@ -19,4 +19,8 @@ libpkcs15init_la_SOURCES = \
 
 include_HEADERS = pkcs15-init.h
 noinst_HEADERS = profile.h
-pkgdata_DATA = flex.profile gpk.profile miocos.profile pkcs15.profile
+pkgdata_DATA = etoken.profile \
+	       flex.profile \
+	       gpk.profile \
+	       miocos.profile \
+	       pkcs15.profile
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 78ac8ebe..1639e8f7 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to create Makefile.in
 
-MAINTAINERCLEANFILES = Makefile.in Makefile.mak
+MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@