diff --git a/Makefile.am b/Makefile.am
index ec8bbaaeb6..ceb8d9653a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ SUBDIRS = config development po $(BOOST) src sourcedoc lib \
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
 	INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
 	README.Win32 README.Cygwin README.localization lyx.1in \
-	autogen.sh
+	autogen.sh CMakeLists.txt po/CMakeLists.txt
 
 man_MANS = lyx.1
 
diff --git a/boost/Makefile.am b/boost/Makefile.am
index d5ec00d7eb..4e52873223 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -7,7 +7,15 @@ noinst_LIBRARIES = liblyxboost.a
 #BUILT_SOURCES = $(PCH_FILE)
 #AM_CPPFLAGS += $(PCH_FLAGS)
 
-EXTRA_DIST = boost
+EXTRA_DIST = boost \
+	CMakeLists.txt \
+	libs/CMakeLists.txt \
+	libs/regex/CMakeLists.txt \
+	libs/regex/regex.vcproj \
+	libs/regex/src/CMakeLists.txt \
+	libs/signals/CMakeLists.txt \
+	libs/signals/signals.vcproj \
+	libs/signals/src/CMakeLists.txt
 
 AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>" 
 AM_CPPFLAGS +=  $(BOOST_INCLUDES)
diff --git a/development/Makefile.am b/development/Makefile.am
index ce53bab1de..db5de46291 100644
--- a/development/Makefile.am
+++ b/development/Makefile.am
@@ -38,6 +38,7 @@ Win32/packaging/installer/gui/external.nsh \
 Win32/packaging/installer/gui/io_latex.ini \
 Win32/packaging/installer/gui/LaTeXFolder.nsh \
 Win32/packaging/installer/include/declarations.nsh \
+Win32/packaging/installer/include/declarations.nsh.cmake \
 Win32/packaging/installer/include/detection.nsh \
 Win32/packaging/installer/include/dictionaries.nsh \
 Win32/packaging/installer/include/filelist.nsh \
@@ -90,6 +91,7 @@ Win32/vld/cmake/vld.cmake \
 autotests/CMakeLists.txt \
 autotests/check_load.cmake \
 autotests/export.cmake \
+autotests/ExportTests.cmake \
 autotests/keytest.py \
 autotests/lyx2lyxtest.cmake \
 autotests/single-test.cmake \
@@ -100,6 +102,9 @@ checkurls/search_url.pl \
 cmake/ConfigureChecks.cmake \
 cmake/Install.cmake \
 cmake/LyxPackaging.cmake \
+cmake/LyX_description.txt \
+cmake/LyX_license.txt \
+cmake/LyX_summary.txt \
 cmake/PyCompile.cmake \
 cmake/config.cpp.cmake \
 cmake/config.h.cmake \
@@ -110,10 +115,12 @@ cmake/doc/CMakeLists.txt \
 cmake/doc/ReplaceValues.pl \
 cmake/doc/ReplaceValues.py \
 cmake/lyx_date.h.cmake \
+cmake/lyx.rc \
 cmake/man/CMakeLists.txt \
 cmake/modules/FindASPELL.cmake \
 cmake/modules/FindAiksaurusLIB.cmake \
 cmake/modules/FindEnchant.cmake \
+cmake/modules/FindCXX11Compiler.cmake \
 cmake/modules/FindGNUWIN32.cmake \
 cmake/modules/FindHunspell.cmake \
 cmake/modules/FindICONV.cmake \
@@ -129,9 +136,11 @@ cmake/modules/LyXuic.cmake \
 cmake/modules/MacroBoolTo01.cmake \
 cmake/modules/PCHSupport_26.cmake \
 cmake/modules/ProjectSourceGroup.cmake \
+cmake/pcheaders.h \
 cmake/po/cat.py \
 cmake/po/dos2unix.py \
 cmake/po/unix2dos.py \
+cmake/post_install/CMakeLists.txt \
 cmake/scripts/LyXCreateImagesResource.cmake \
 cmake/scripts/LyXGetVersion.cmake \
 keystest/cache-bisect.py \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 60a0327ff7..32b51334c0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = doc lyx2lyx
 
 CHMOD = chmod
 
+EXTRA_DIST = examples/CMakeLists.txt scripts/CMakeLists.txt
+
 dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx external_templates \
 	encodings layouttranslations languages latexfonts symbols syntax.default \
 	unicodesymbols
diff --git a/lib/lyx2lyx/Makefile.am b/lib/lyx2lyx/Makefile.am
index 4bc7641851..ace1d72bc3 100644
--- a/lib/lyx2lyx/Makefile.am
+++ b/lib/lyx2lyx/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 CLEANFILES += *.pyc *.pyo
 
-EXTRA_DIST = lyx2lyx_version.py.in test_parser_tools.py
+EXTRA_DIST = lyx2lyx_version.py.in test_parser_tools.py CMakeLists.txt
 
 CHMOD = chmod
 
diff --git a/sourcedoc/Makefile.am b/sourcedoc/Makefile.am
index c446d5c753..9b69fa6456 100644
--- a/sourcedoc/Makefile.am
+++ b/sourcedoc/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = Doxyfile.in
+EXTRA_DIST = Doxyfile.in CMakeLists.txt
 
 OUTPUT_DIR = .
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 17bad02b84..dccf8d1de0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,12 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = pch.h
+EXTRA_DIST = pch.h \
+	CMakeLists.txt \
+	graphics/CMakeLists.txt \
+	insets/CMakeLists.txt \
+	mathed/CMakeLists.txt \
+	tests/CMakeLists.txt
 
 OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
             @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
@@ -668,7 +673,7 @@ endif
 ############################## Tests ##################################
 
 EXTRA_DIST += \
-	tests/test_layout
+	tests/test_layout CMakeLists.txt
 
 alltests: check alltests-recursive
 
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 3251ac1a1a..d652f0f696 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -6,7 +6,7 @@ man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-EXTRA_DIST = lyxclient.1in
+EXTRA_DIST = lyxclient.1in CMakeLists.txt
 
 AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
 
diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index ea0f09793f..aa74e57eca 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -27,6 +27,9 @@ liblyxfrontends_a_SOURCES = \
 ################################# Tests ################################
 
 EXTRA_DIST = \
+	CMakeLists.txt \
+	tests/CMakeLists.txt \
+	tests/test_biblio.cmake \
 	tests/test_biblio \
 	tests/regfiles/biblio
 
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5270ba46d1..21e866d1f7 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -378,7 +378,7 @@ liblyxqt4_a_SOURCES = \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)
 
-EXTRA_DIST = pch.h $(UIFILES:%=ui/%)
+EXTRA_DIST = pch.h CMakeLists.txt $(UIFILES:%=ui/%)
 BUILT_SOURCES += $(PCH_FILE)
 AM_CPPFLAGS += $(PCH_FLAGS)
 
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 52e31aa859..ac43818e3e 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -3,7 +3,8 @@ include $(top_srcdir)/config/common.am
 CLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST = pch.h \
-	os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
+	os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
+	CMakeLists.txt tests/CMakeLists.txt tests/supporttest.cmake
 
 noinst_LIBRARIES = liblyxsupport.a
 
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index fe36218a77..810e693b26 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) pch.h
+EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) pch.h \
+	CMakeLists.txt test/CMakeLists.txt
 
 #noinst_LIBRARIES = libtexparser.a
 #
@@ -20,6 +21,7 @@ AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
 	-I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
 
 TEST_FILES = \
+	test/runtests.cmake \
 	test/runtests.py \
 	test/box-color-size-space-align.tex \
 	test/CJK.tex \