diff --git a/src/Makefile.am b/src/Makefile.am
index 20e9ba00..fa3e5cb5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,9 +16,14 @@
 
 include $(top_srcdir)/gtest.mk
 
-# enforce compiling this dir first before decending into tests/
+# enforce compiling guile (optionally) first,then this dir first
+# before decending into tests/
 SUBDIRS= .
 
+if HAVE_GUILE
+SUBDIRS += guile
+endif
+
 if BUILD_TESTS
 SUBDIRS += tests
 endif
@@ -108,6 +113,7 @@ libmu_la_SOURCES=			\
 	mu-util.h
 
 
+
 libmu_la_LIBADD=			\
 	$(XAPIAN_LIBS)			\
 	$(GMIME_LIBS)			\
diff --git a/src/mu-cmd-server.c b/src/mu-cmd-server.c
index ab146127..dde43834 100644
--- a/src/mu-cmd-server.c
+++ b/src/mu-cmd-server.c
@@ -299,7 +299,10 @@ cmd_info (MuStore *store, GSList *lst, GError **err)
 		return server_error (NULL, MU_ERROR_IN_PARAMETERS,
 				     "usage: version");
 
-	send_expr ("(:info version :version \"" VERSION "\" :doccount %u)",
+	send_expr ("(:info version "
+		    ":version \"" VERSION "\" "
+		    ":doccount %u "
+		   ")",
 		   mu_store_count (store, err));
 
 	return MU_OK;
diff --git a/src/mu.cc b/src/mu.cc
index 9118073c..02b728f0 100644
--- a/src/mu.cc
+++ b/src/mu.cc
@@ -19,6 +19,10 @@
 **
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /*HAVE_CONFIG_H*/
+
 #include <glib.h>
 
 #include "mu-cmd.h"
@@ -75,4 +79,3 @@ main (int argc, char *argv[])
 	mu_runtime_uninit ();
 	return rv;
 }
-