diff --git a/Makefile.am b/Makefile.am
index d811d03e..e6eb281b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,10 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
-SUBDIRS = . aclocal docs etc src win32
+SUBDIRS = . tools aclocal docs etc src win32
 
 EXTRA_DIST = CodingStyle README.cards README.signer README.Win32 \
-	bootstrap depcomp Makefile.mak
+	bootstrap Makefile.mak
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 acinclude.m4 \
-	config.guess config.h.in config.sub configure \
-	install-sh ltmain.sh missing mkinstalldirs ylwrap \
-	compile config.log config.status depcomp
+MAINTAINERCLEANFILES = Makefile.in config.h.in configure
+DEPCLEANFILES = config.log configure 
 
diff --git a/configure.in b/configure.in
index a432fea8..e22b206a 100644
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,9 @@ dnl Process this file with autoconf to produce a configure script.
 
 # Require autoconf 2.52
 AC_PREREQ(2.52)
-
 AC_INIT(src/libopensc/sc.c)
+AC_CONFIG_AUX_DIR(tools)
+
 AM_INIT_AUTOMAKE(opensc, 0.8.0-rc1)
 AM_CONFIG_HEADER(config.h)
 
@@ -1176,6 +1177,7 @@ src/sslengines/Makefile
 src/tests/Makefile
 src/tools/Makefile
 src/usbtoken/Makefile
+tools/Makefile
 win32/Makefile
 ])