diff --git a/Makefile.am b/Makefile.am
index 59842adfeb..7237120f7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,12 +9,18 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
-if USE_INCLUDED_BOOST
-SUBDIRS = config development intl po boost src sourcedoc lib
-else
-SUBDIRS = config development intl po src sourcedoc lib
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
 endif
 
+if USE_INCLUDED_BOOST
+BOOST = boost
+endif
+
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+	$(CLIENT) src/tex2lyx
+
+
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
 	INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
 	README.Win32 README.Cygwin lyx.man autogen.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index b724190af3..430bf0519f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,7 @@ DISTCLEANFILES += config.h libintl.h version.cpp stamp-version version.cpp-tmp
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-if BUILD_CLIENT_SUBDIR
-CLIENT = client
-endif
-
-SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
+SUBDIRS = mathed insets graphics support frontends .
 
 EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
 	Section.h \
diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 5955bd66e2..58b04423e0 100644
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -546,7 +546,7 @@ goto_char_backwards:
 	case LFUN_DOWN:
 	case LFUN_UP:
 		cur.updateFlags(Update::Decoration | Update::FitCursor);
-	case LFUN_DOWN_SELECT: 
+	case LFUN_DOWN_SELECT:
 	case LFUN_UP_SELECT: {
 		// close active macro
 		if (cur.inMacroMode()) {