diff --git a/configure.ac b/configure.ac
index 3dca5e9c..833dad8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 AC_INIT([mu],[0.7dev],[http://www.djcbsoftware.nl/code/mu])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([src/mu.c])
+AC_CONFIG_SRCDIR([src/mu.cc])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 # we set the set the version of the Xapian database layout here; it
diff --git a/src/Makefile.am b/src/Makefile.am
index de17e04b..7b8fefea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,8 +32,10 @@ bin_PROGRAMS=				\
 noinst_LTLIBRARIES=			\
 	libmu.la
 
+# note, mu.cc is only '.cc' and not '.c' because libmu must explicitly
+# be linked as c++, not c.
 mu_SOURCES=				\
-	mu.c
+	mu.cc
 
 mu_LDADD=				\
 	libmu.la
@@ -41,6 +43,10 @@ mu_LDADD=				\
 libmu_la_SOURCES=			\
 	mu-cmd.c			\
 	mu-cmd.h			\
+	mu-cmd-find.h			\
+	mu-cmd-find.c			\
+	mu-cmd-index.h			\
+	mu-cmd-index.c			\
 	mu-config.c			\
 	mu-config.h			\
 	mu-index.c			\
diff --git a/src/mu.c b/src/mu.cc
similarity index 100%
rename from src/mu.c
rename to src/mu.cc