diff --git a/Makefile.am b/Makefile.am
index f488cde..210f134 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src data doc
 
-EXTRA_DIST = doc INSTALL README doxygen.conf autogen
+
+EXTRA_DIST = INSTALL README doxygen.conf autogen
diff --git a/configure.in b/configure.in
index 8bd0576..c386d0e 100644
--- a/configure.in
+++ b/configure.in
@@ -166,7 +166,13 @@ AC_SUBST(TARGET_HAVE_READLINE)
 #AC_SUBST(LIBXMLPP_LIBS)
 
 
-AC_CONFIG_FILES([Makefile src/Makefile src/lib/Makefile src/tools/Makefile ])
+AC_CONFIG_FILES([Makefile 
+		doc/Makefile
+		data/Makefile
+		src/Makefile 
+		src/lib/Makefile 
+		src/tools/Makefile 
+		])
 AC_OUTPUT
 
 dnl configure.in ends here