diff --git a/development/Makefile.am b/development/Makefile.am
index fa74011db9..acf379d52e 100644
--- a/development/Makefile.am
+++ b/development/Makefile.am
@@ -131,26 +131,20 @@ scons/qt4.py \
 scons/scons_manifest.py \
 scons/SConstruct \
 scons/scons_utils.py \
-cmake/CMakeLists.txt \
+Win32/packaging/installer/lyx.nsi.cmake \
+Win32/packaging/installer/settings.nsh.cmake \
+Win32/vld/cmake/CMakeLists.txt \
+Win32/vld/cmake/vld.cmake \
 cmake/ConfigureChecks.cmake \
 cmake/Install.cmake \
-cmake/LyX_description.txt \
-cmake/LyX_license.txt \
-cmake/LyX_summary.txt \
+cmake/LyxPackaging.cmake \
 cmake/PyCompile.cmake \
-cmake/build.bat \
 cmake/config.cpp.cmake \
 cmake/config.h.cmake \
 cmake/configCompiler.h.cmake \
-cmake/configCompiler.h.msvc \
-cmake/lyx.rc \
-cmake/pcheaders.h \
-cmake/boost/CMakeLists.txt \
 cmake/doc/CMakeLists.txt \
+cmake/doc/ReplaceValues.pl \
 cmake/doc/ReplaceValues.py \
-cmake/intl/CMakeLists.txt \
-cmake/intl/libgnuintl.h \
-cmake/lyx2lyx/CMakeLists.txt \
 cmake/man/CMakeLists.txt \
 cmake/modules/FindASPELL.cmake \
 cmake/modules/FindAiksaurusLIB.cmake \
@@ -170,19 +164,6 @@ cmake/modules/LyXuic.cmake \
 cmake/modules/MacroBoolTo01.cmake \
 cmake/modules/PCHSupport_26.cmake \
 cmake/modules/ProjectSourceGroup.cmake \
-cmake/po/CMakeLists.txt \
 cmake/po/cat.py \
-cmake/scripts/CMakeLists.txt \
-cmake/src/CMakeLists.txt \
-cmake/src/dummy.cpp \
-cmake/boost/libs/CMakeLists.txt \
-cmake/src/client/CMakeLists.txt \
-cmake/src/frontends/CMakeLists.txt \
-cmake/src/graphics/CMakeLists.txt \
-cmake/src/insets/CMakeLists.txt \
-cmake/src/mathed/CMakeLists.txt \
-cmake/src/support/CMakeLists.txt \
-cmake/src/tex2lyx/CMakeLists.txt \
-cmake/boost/libs/regex/CMakeLists.txt \
-cmake/boost/libs/signals/CMakeLists.txt \
-cmake/src/frontends/qt4/CMakeLists.txt
+cmake/po/dos2unix.py \
+cmake/po/unix2dos.py
diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake
index a35f5b3137..c212264071 100644
--- a/development/cmake/configCompiler.h.cmake
+++ b/development/cmake/configCompiler.h.cmake
@@ -135,7 +135,7 @@
 #endif
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 
-#define BOOST_DISABLE_THREADS 1
+//#define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__