diff --git a/ccid/Makefile.am b/ccid/Makefile.am
index 0a7b929..38f289b 100644
--- a/ccid/Makefile.am
+++ b/ccid/Makefile.am
@@ -1,2 +1,2 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src
+SUBDIRS = src m4
diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am
index 1ad83d1..f60ea1d 100644
--- a/ccid/src/Makefile.am
+++ b/ccid/src/Makefile.am
@@ -15,3 +15,5 @@ ccid_CFLAGS = $(OPENSC_CFLAGS) $(PTHREAD_CFLAGS)
 pace_tool_SOURCES = sm.c pace-tool.c binutil.c scutil.c pace.c pace_lib.c
 pace_tool_LDADD = $(OPENSC_LIBS) $(OPENSSL_LIBS)
 pace_tool_CFLAGS = $(OPENSC_CFLAGS) $(OPENSSL_CFLAGS)
+
+noinst_HEADERS = binutil.h  ccid.h  pace.h  pace_lib.h  scutil.h  sm.h  usbstring.h