diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 8706d08100..40eb64367a 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -1,6 +1,9 @@
 include $(top_srcdir)/config/common.am
 
-DIST_SUBDIRS = hunspell libiconv zlib
+DIST_SUBDIRS = boost hunspell libiconv zlib
 
-SUBDIRS = hunspell libiconv zlib
+if USE_INCLUDED_BOOST
+BOOST = boost
+endif
 
+SUBDIRS = $(BOOST)
diff --git a/Makefile.am b/Makefile.am
index 023828f99c..c60a282b39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,17 +5,14 @@ ACLOCAL_AMFLAGS = -I m4 -I config
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
 	$(srcdir)/config.h.in
 
-DIST_SUBDIRS = 3rdparty autotests m4 config development po boost src sourcedoc lib
+DIST_SUBDIRS = 3rdparty autotests m4 config development po src sourcedoc lib
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = src/client
 endif
 
-if USE_INCLUDED_BOOST
-BOOST = boost
-endif
 
-SUBDIRS = autotests config development po $(BOOST) src sourcedoc lib \
+SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
 	$(CLIENT) src/tex2lyx
 
 
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 8f240dd4f3..5c8ff6c23d 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -377,8 +377,8 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 	AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
 	AC_MSG_RESULT([$lyx_cv_with_included_boost])
 	if test x$lyx_cv_with_included_boost = xyes ; then
-	    BOOST_INCLUDES='-I$(top_srcdir)/boost'
-	    BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a'
+	    BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'
+	    BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
 	else
 	    AC_LANG_PUSH(C++)
 	    save_LIBS=$LIBS
diff --git a/configure.ac b/configure.ac
index 2856b0757c..1d7eef5001 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,11 +350,11 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 AC_CONFIG_FILES([Makefile \
       lyx.1:lyx.1in \
       3rdparty/Makefile \
+      3rdparty/boost/Makefile \
       3rdparty/hunspell/Makefile \
       3rdparty/libiconv/Makefile \
       3rdparty/zlib/Makefile \
       autotests/Makefile \
-      boost/Makefile \
       config/Makefile \
       development/Makefile \
       development/MacOSX/Makefile \