diff --git a/Makefile.am b/Makefile.am
index 06497d59..939f2b41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,11 +14,11 @@
 ## along with this program; if not, write to the Free Software Foundation,
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-SUBDIRS=src
+SUBDIRS=src man
 
 # calculate the cyclomatic-complexity, which should not go over 10
-#cc10:
-#	@pmccabe `find . -regex '.*\.\(c\|cc\|h\)$'`  | sort -nr | awk '($$1 > 10)'
+cc10:
+	@pmccabe `find . -regex '.*\.\(c\|cc\|h\)$'`  | sort -nr | awk '($$1 > 10)'
 
 EXTRA_DIST=	\
 	TODO	\
diff --git a/configure.ac b/configure.ac
index 01ebb45c..790f43b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 ## along with this program; if not, write to the Free Software Foundation,
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
 
-AC_INIT([mu],[0.6],[http://www.djcbsoftware.nl/code/mu])
+AC_INIT([mu],[0.6-beta],[http://www.djcbsoftware.nl/code/mu])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/mu.c])
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -97,10 +97,10 @@ AC_SUBST(XAPIAN_LIBS)
 AC_OUTPUT([
 Makefile
 src/Makefile
+man/Makefile
 ])
 
 
 echo
-echo "-----------------------------"
 echo "mu configuration is complete."
 echo "type 'make' to build it"
diff --git a/man/Makefile.am b/man/Makefile.am
index 3b9597ad..6f858214 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -14,7 +14,4 @@
 ## along with this program; if not, write to the Free Software Foundation,
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-man_MANS=		\
-	mu.1
-
-dist_man_MANS = $(man_MANS)
+dist_man_MANS = mu.1
diff --git a/src/Makefile.am b/src/Makefile.am
index 541da2ab..cfb7b0d9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,6 +41,7 @@ mu_SOURCES=			\
 	mu-msg-xapian-priv.hh	\
 	mu-msg-xapian.cc	\
 	mu-msg-xapian.h		\
+	mu-msg.h		\
 	mu-query-xapian.cc	\
 	mu-query-xapian.h	\
 	mu-result.h		\