diff --git a/Makefile.am b/Makefile.am
index fdf454ed..0fbca44f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = . aclocal src
 
-EXTRA_DIST = bootstrap README.Cryptoflex
+EXTRA_DIST = CodingStyle README.Cryptoflex bootstrap
 
 # require automake 1.5
 AUTOMAKE_OPTIONS = 1.5
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index cba663b7..4165b7c2 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -3,6 +3,8 @@
 INCLUDES = @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
+EXTRA_DIST = gpk.profile miocos-rw.profile pkcs15.profile
+
 if HAVE_SSL
 PROGRAMS_SSL = cryptoflex-tool pkcs15-init
 endif
@@ -23,4 +25,4 @@ cryptoflex_tool_LDADD = @GETOPTSRC@ @LIBCRYPTO@
 pkcs15_init_SOURCES = pkcs15-init.c profile.c util.c \
 		      pkcs15-gpk.c pkcs15-miocos.c
 pkcs15_init_LDADD = @GETOPTSRC@ @LIBCRYPTO@
-noinst_HEADERS = util.h profile.h
+noinst_HEADERS = util.h profile.h pkcs15-init.h
diff --git a/src/tools/profile.h b/src/tools/profile.h
index 27f84105..870ee6d6 100644
--- a/src/tools/profile.h
+++ b/src/tools/profile.h
@@ -62,7 +62,9 @@ struct pin_info {
 struct sc_key_template {
 	char *			ident;
 	struct sc_key_template *next;
-	//struct file_info *	file;
+#if 0
+	struct file_info *	file;
+#endif
 	struct sc_file *	file;
 	unsigned int		index;	/* translates to file offset */
 	struct sc_acl_entry *	key_acl;/* PINs for key usage */
diff --git a/src/tools/util.h b/src/tools/util.h
index 3beeaf25..700c4cb1 100644
--- a/src/tools/util.h
+++ b/src/tools/util.h
@@ -1,5 +1,3 @@
-
-
 #ifndef UTIL_H
 #define UTIL_H