diff --git a/Makefile.am b/Makefile.am
index d1e0bdab88..cd3e8f589b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,10 @@ dist_doc_DATA = \
 
 EXTRA_DIST = \
   $(SWIG_DIST_FAIL) \
+  CMakeLists.txt \
+  cmake/cmake_uninstall.cmake.in \
+  cmake/README_CMAKE.txt \
+  cmake/CMakeLists.txt \
   make-gnucash-potfiles.in \
   macros/binreloc.m4 \
   macros/compiler-flags.m4 \
@@ -61,6 +65,10 @@ EXTRA_DIST = \
   macros/ax_python_devel.m4 \
   macros/ax_swig_python.m4 \
   macros/legacy_macros.m4 \
+  macros/CMakeLists.txt \
+  po/CMakeLists.txt \
+  po/check-po.cmake \
+  po/glossary/CMakeLists.txt \
   po/gnucash.pot \
   po/POTFILES.in \
   po/POTFILES.skip \
@@ -94,7 +102,10 @@ EXTRA_DIST = \
   intltool-extract.in \
   intltool-merge.in \
   intltool-update.in \
-  util/gnc-vcs-info
+  test-templates/CMakeLists.txt \
+  test-templates/Makefile.am \
+  util/gnc-vcs-info \
+  util/CMakeLists.txt
 
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @...@.  This prevents autoconf
diff --git a/accounts/C/Makefile.am b/accounts/C/Makefile.am
index e50743e214..9b3bb35e76 100644
--- a/accounts/C/Makefile.am
+++ b/accounts/C/Makefile.am
@@ -21,4 +21,5 @@ account_DATA = \
 
 EXTRA_DIST = \
   ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
diff --git a/accounts/Makefile.am b/accounts/Makefile.am
index 1e1a7cab5c..b43c773da6 100644
--- a/accounts/Makefile.am
+++ b/accounts/Makefile.am
@@ -35,3 +35,4 @@ SUBDIRS = \
 	zh_HK \
 	zh_TW
 
+EXTRA_DIST = CMakeLists.txt
diff --git a/accounts/cs/Makefile.am b/accounts/cs/Makefile.am
index 364fd36502..99c9b0c360 100644
--- a/accounts/cs/Makefile.am
+++ b/accounts/cs/Makefile.am
@@ -19,4 +19,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/da/Makefile.am b/accounts/da/Makefile.am
index 9699f144dc..6bbcebb7da 100644
--- a/accounts/da/Makefile.am
+++ b/accounts/da/Makefile.am
@@ -8,4 +8,5 @@ account_DATA = \
   acctchrt_homeown.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/de_AT/Makefile.am b/accounts/de_AT/Makefile.am
index 40012d0642..373c2af391 100644
--- a/accounts/de_AT/Makefile.am
+++ b/accounts/de_AT/Makefile.am
@@ -10,3 +10,5 @@ dist_account_DATA = \
  acctchrt_houseown.gnucash-xea \
  acctchrt_investment.gnucash-xea \
  acctchrt_kids.gnucash-xea
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/accounts/de_CH/Makefile.am b/accounts/de_CH/Makefile.am
index 24ec52a0e4..0d38f5f5da 100644
--- a/accounts/de_CH/Makefile.am
+++ b/accounts/de_CH/Makefile.am
@@ -10,4 +10,5 @@ account_DATA = \
   acctchrt_chkmu.gnucash-xea 
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/de_DE/Makefile.am b/accounts/de_DE/Makefile.am
index 60693c1818..550cea6e14 100644
--- a/accounts/de_DE/Makefile.am
+++ b/accounts/de_DE/Makefile.am
@@ -20,4 +20,5 @@ account_DATA = \
 
 EXTRA_DIST = \
   ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea  \
+  CMakeLists.txt
diff --git a/accounts/el_GR/Makefile.am b/accounts/el_GR/Makefile.am
index 9963e206fc..63502f696e 100644
--- a/accounts/el_GR/Makefile.am
+++ b/accounts/el_GR/Makefile.am
@@ -7,4 +7,5 @@ account_DATA = \
   acctchrt_brokerage.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/en_GB/Makefile.am b/accounts/en_GB/Makefile.am
index 0896af994e..64553ab323 100644
--- a/accounts/en_GB/Makefile.am
+++ b/accounts/en_GB/Makefile.am
@@ -22,4 +22,5 @@ account_DATA = \
 
 EXTRA_DIST = \
   ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
diff --git a/accounts/es_ES/Makefile.am b/accounts/es_ES/Makefile.am
index 336b8ad7f0..c2250fcef9 100644
--- a/accounts/es_ES/Makefile.am
+++ b/accounts/es_ES/Makefile.am
@@ -19,5 +19,6 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
 
diff --git a/accounts/es_MX/Makefile.am b/accounts/es_MX/Makefile.am
index 20e6a70da6..6e3fcfee02 100644
--- a/accounts/es_MX/Makefile.am
+++ b/accounts/es_MX/Makefile.am
@@ -19,5 +19,6 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+${account_DATA} \
+CMakeLists.txt
 
diff --git a/accounts/fi_FI/Makefile.am b/accounts/fi_FI/Makefile.am
index 83fd51e939..f9ce46a1b4 100644
--- a/accounts/fi_FI/Makefile.am
+++ b/accounts/fi_FI/Makefile.am
@@ -7,4 +7,5 @@ account_DATA = \
   acctchrt_ry.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/fr_CA/Makefile.am b/accounts/fr_CA/Makefile.am
index d776d7453c..dbba85936e 100644
--- a/accounts/fr_CA/Makefile.am
+++ b/accounts/fr_CA/Makefile.am
@@ -17,4 +17,5 @@ account_DATA = \
  acctchrt_revenus.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/fr_CH/Makefile.am b/accounts/fr_CH/Makefile.am
index 3423b37981..0a7b1ce6e1 100644
--- a/accounts/fr_CH/Makefile.am
+++ b/accounts/fr_CH/Makefile.am
@@ -20,4 +20,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/fr_FR/Makefile.am b/accounts/fr_FR/Makefile.am
index 65da42f602..bec4d803c5 100644
--- a/accounts/fr_FR/Makefile.am
+++ b/accounts/fr_FR/Makefile.am
@@ -20,4 +20,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/hu_HU/Makefile.am b/accounts/hu_HU/Makefile.am
index a3b49adc2f..1cc8864af8 100644
--- a/accounts/hu_HU/Makefile.am
+++ b/accounts/hu_HU/Makefile.am
@@ -20,4 +20,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/it/Makefile.am b/accounts/it/Makefile.am
index 1392f7edb7..88dadf5c40 100644
--- a/accounts/it/Makefile.am
+++ b/accounts/it/Makefile.am
@@ -18,4 +18,5 @@ account_DATA = \
 
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/ja/Makefile.am b/accounts/ja/Makefile.am
index e2ccce1719..63b7355c0d 100644
--- a/accounts/ja/Makefile.am
+++ b/accounts/ja/Makefile.am
@@ -21,4 +21,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/ko/Makefile.am b/accounts/ko/Makefile.am
index 31ba2a022d..5473dff7f7 100644
--- a/accounts/ko/Makefile.am
+++ b/accounts/ko/Makefile.am
@@ -20,4 +20,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/lt/Makefile.am b/accounts/lt/Makefile.am
index 64aa91d38e..3a95f11c26 100644
--- a/accounts/lt/Makefile.am
+++ b/accounts/lt/Makefile.am
@@ -5,5 +5,6 @@ account_DATA = \
   acctchrt_business.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
 
diff --git a/accounts/lv/Makefile.am b/accounts/lv/Makefile.am
index f859258b26..a17c0696db 100644
--- a/accounts/lv/Makefile.am
+++ b/accounts/lv/Makefile.am
@@ -21,4 +21,5 @@ account_DATA = \
 
 EXTRA_DIST = \
   ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
diff --git a/accounts/nb/Makefile.am b/accounts/nb/Makefile.am
index 290efad189..5a67c4968e 100644
--- a/accounts/nb/Makefile.am
+++ b/accounts/nb/Makefile.am
@@ -22,4 +22,5 @@ account_DATA = \
 
 EXTRA_DIST = \
   ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
diff --git a/accounts/nl/Makefile.am b/accounts/nl/Makefile.am
index 3f7ff884cf..860f7ea9d6 100644
--- a/accounts/nl/Makefile.am
+++ b/accounts/nl/Makefile.am
@@ -6,4 +6,5 @@ account_DATA = \
   acctchrt_rgs_1.1.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/pl/Makefile.am b/accounts/pl/Makefile.am
index d03315a398..2584d8562a 100644
--- a/accounts/pl/Makefile.am
+++ b/accounts/pl/Makefile.am
@@ -21,4 +21,5 @@ account_DATA = \
 
 EXTRA_DIST = \
   ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
diff --git a/accounts/pt_BR/Makefile.am b/accounts/pt_BR/Makefile.am
index 812bfe7b69..f272186177 100644
--- a/accounts/pt_BR/Makefile.am
+++ b/accounts/pt_BR/Makefile.am
@@ -19,4 +19,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/pt_PT/Makefile.am b/accounts/pt_PT/Makefile.am
index c89868eb91..33a9250450 100644
--- a/accounts/pt_PT/Makefile.am
+++ b/accounts/pt_PT/Makefile.am
@@ -18,4 +18,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/ru/Makefile.am b/accounts/ru/Makefile.am
index e300417e53..0aee45589c 100644
--- a/accounts/ru/Makefile.am
+++ b/accounts/ru/Makefile.am
@@ -8,4 +8,5 @@ account_DATA = \
   acctchrt_renter.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/sk/Makefile.am b/accounts/sk/Makefile.am
index 80e00d7471..8e72d170a2 100644
--- a/accounts/sk/Makefile.am
+++ b/accounts/sk/Makefile.am
@@ -19,4 +19,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/sv_AX/Makefile.am b/accounts/sv_AX/Makefile.am
index 8e1d626deb..face1efd97 100644
--- a/accounts/sv_AX/Makefile.am
+++ b/accounts/sv_AX/Makefile.am
@@ -7,4 +7,5 @@ account_DATA = \
     acctchrt_rf.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/sv_FI/Makefile.am b/accounts/sv_FI/Makefile.am
index 8e5ae7bb15..b90869de29 100644
--- a/accounts/sv_FI/Makefile.am
+++ b/accounts/sv_FI/Makefile.am
@@ -7,4 +7,5 @@ account_DATA = \
     acctchrt_rf.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/sv_SE/Makefile.am b/accounts/sv_SE/Makefile.am
index 4b5c0a6065..cb37583766 100644
--- a/accounts/sv_SE/Makefile.am
+++ b/accounts/sv_SE/Makefile.am
@@ -6,4 +6,5 @@ account_DATA = \
 	acctchrt_common.gnucash-xea 
 EXTRA_DIST = \
   README.bas_2012 \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/tr_TR/Makefile.am b/accounts/tr_TR/Makefile.am
index 66c2036500..cd773abc16 100644
--- a/accounts/tr_TR/Makefile.am
+++ b/accounts/tr_TR/Makefile.am
@@ -12,4 +12,5 @@ account_DATA = \
  acctchrt_TEKDUZ.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/zh_CN/Makefile.am b/accounts/zh_CN/Makefile.am
index 1a42448c05..2bd1876357 100644
--- a/accounts/zh_CN/Makefile.am
+++ b/accounts/zh_CN/Makefile.am
@@ -21,4 +21,5 @@ account_DATA = \
 
 EXTRA_DIST = \
   ${account_DATA} \
-  acctchrt_full.gnucash-xea 
+  acctchrt_full.gnucash-xea \
+  CMakeLists.txt
diff --git a/accounts/zh_HK/Makefile.am b/accounts/zh_HK/Makefile.am
index d7fafd5cdf..d8dad2a89a 100644
--- a/accounts/zh_HK/Makefile.am
+++ b/accounts/zh_HK/Makefile.am
@@ -5,4 +5,5 @@ account_DATA = \
   acctchrt_business.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/accounts/zh_TW/Makefile.am b/accounts/zh_TW/Makefile.am
index 32f56b6839..bc4ff24a8c 100644
--- a/accounts/zh_TW/Makefile.am
+++ b/accounts/zh_TW/Makefile.am
@@ -5,4 +5,5 @@ account_DATA = \
   acctchrt_business.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA}
+  ${account_DATA} \
+  CMakeLists.txt
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 94b328618d..9524339a3a 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -10,4 +10,4 @@ checks_DATA = \
 	quicken_check_21.chk \
 	quicken_3part.chk
 
-EXTRA_DIST = ${checks_DATA}
+EXTRA_DIST = ${checks_DATA} CMakeLists.txt
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8e70d4df81..9dbc32ddd0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,7 +34,8 @@ EXTRA_DIST = \
   gnucash.1.in \
   gtkrc-2.0.gnucash \
   misc-notes.txt \
-  tip_of_the_day.list.in
+  tip_of_the_day.list.in \
+  CMakeLists.txt
 
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @...@.  This prevents autoconf
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 96dc4afa20..ce1cc3de96 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -20,4 +20,5 @@ doc_DATA = \
   web.qif
 
 EXTRA_DIST = \
-  ${doc_DATA}
+  ${doc_DATA} \
+  CMakeLists.txt
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5930c6f5e8..a18f998a8e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,5 +4,5 @@ else
 SUBDIRS = libc
 endif
 
-EXTRA_DIST = README
+EXTRA_DIST = README CMakeLists.txt
 
diff --git a/lib/goffice/CMakeLists.txt b/lib/goffice/CMakeLists.txt
index d47be15d83..adb1fcaaec 100644
--- a/lib/goffice/CMakeLists.txt
+++ b/lib/goffice/CMakeLists.txt
@@ -11,4 +11,5 @@ set(goffice_SOURCES go-optionmenu.c go-charmap-sel.c go-glib-extras.c)
 #  ARCHIVE DESTINATION lib
 #  RUNTIME DESTINATION bin)
 
-SET_DIST_LIST(goffice_DIST CMakeLists.txt Makefile.am ${goffice_noinst_HEADERS} ${goffice_SOURCES})
+SET_DIST_LIST(goffice_DIST CMakeLists.txt Makefile.am
+  README ${goffice_noinst_HEADERS} ${goffice_SOURCES})
diff --git a/lib/goffice/Makefile.am b/lib/goffice/Makefile.am
index f6c25ae48d..9953916337 100644
--- a/lib/goffice/Makefile.am
+++ b/lib/goffice/Makefile.am
@@ -16,4 +16,4 @@ libgnc_goffice_la_LIBADD = $(GTK_LIBS) \
 AM_CPPFLAGS = $(GTK_CFLAGS) \
               ${LIBXML2_CFLAGS}
 
-EXTRA_DIST = $(REALSRCS) $(REALHDRS)
+EXTRA_DIST = $(REALSRCS) $(REALHDRS) CMakeLists.txt
diff --git a/lib/libc/Makefile.am b/lib/libc/Makefile.am
index f0b9509fa5..a4a9f9566d 100644
--- a/lib/libc/Makefile.am
+++ b/lib/libc/Makefile.am
@@ -13,7 +13,8 @@ libc_missing_la_SOURCES = libc-missing-noop.c
 EXTRA_libc_missing_la_SOURCES = \
   setenv.c \
   strfmon.c \
-  strptime.c
+  strptime.c \
+  CMakeLists.txt
 
 # This will automatically be filled in with the necessary object file
 # names.  Configure does this based upon the AC_REPLACE_FUNCS macros.
diff --git a/packaging/Makefile.am b/packaging/Makefile.am
index bc20ab56dc..17a41adee8 100644
--- a/packaging/Makefile.am
+++ b/packaging/Makefile.am
@@ -1,6 +1,7 @@
 EXTRA_DIST = \
   gnucash.spec.in \
-  gnucash.spec
+  gnucash.spec \
+  CMakeLists.txt
 
 all-local: gnucash.spec
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d160b0a998..f9a56da4df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,12 @@
-# This is a list of files which contain tranlatable strings.
+# This is a list of files which contain translatable strings.
 # This file was generated by ../make-gnucash-potfiles.
+lib/goffice/go-charmap-sel.c
+lib/goffice/go-glib-extras.c
+lib/goffice/go-optionmenu.c
+lib/libc/libc-missing-noop.c
+lib/libc/setenv.c
+lib/libc/strfmon.c
+lib/libc/strptime.c
 src/app-utils/app-utils.scm
 src/app-utils/business-helpers.c
 src/app-utils/business-options.c
@@ -81,7 +88,6 @@ src/backend/xml/gnc-freqspec-xml-v2.cpp
 src/backend/xml/gnc-invoice-xml-v2.cpp
 src/backend/xml/gnc-job-xml-v2.cpp
 src/backend/xml/gnc-lot-xml-v2.cpp
-src/backend/xml/gncmod-backend-xml.cpp
 src/backend/xml/gnc-order-xml-v2.cpp
 src/backend/xml/gnc-owner-xml-v2.cpp
 src/backend/xml/gnc-pricedb-xml-v2.cpp
@@ -205,23 +211,8 @@ src/engine/SX-book.c
 src/engine/SX-ttinfo.c
 src/engine/Transaction.c
 src/engine/TransLog.c
-src/gnc/AccountItemModel.cpp
-src/gnc/AccountSelectionDelegate.cpp
-src/gnc/Cmd.cpp
-src/gnc/dashboard.cpp
-src/gnc/fpo/FPO.cpp
-src/gnc/fpo/ViewletModel.cpp
-src/gnc/fpo/ViewletView.cpp
-src/gnc/main.cpp
-src/gnc/mainwindow.cpp
-src/gnc/mainwindow-file.cpp
 src/gnc-module/gnc-module.c
 src/gnc-module/gnc-module.scm
-src/gnc/QofEventWrapper.cpp
-src/gnc/RecentFileMenu.cpp
-src/gnc/Session.cpp
-src/gnc/SplitListModel.cpp
-src/gnc/SplitListView.cpp
 src/gnome/assistant-acct-period.c
 src/gnome/assistant-hierarchy.c
 src/gnome/assistant-loan.c
@@ -288,6 +279,10 @@ src/gnome/gtkbuilder/gnc-plugin-page-register.glade
 src/gnome/gtkbuilder/window-autoclear.glade
 src/gnome/gtkbuilder/window-reconcile.glade
 src/gnome/reconcile-view.c
+src/gnome/top-level.c
+src/gnome/window-autoclear.c
+src/gnome/window-reconcile2.c
+src/gnome/window-reconcile.c
 src/gnome-search/dialog-search.c
 src/gnome-search/dialog-search.glade
 src/gnome-search/gnc-general-search.c
@@ -302,7 +297,6 @@ src/gnome-search/search-int64.c
 src/gnome-search/search-numeric.c
 src/gnome-search/search-reconciled.c
 src/gnome-search/search-string.c
-src/gnome/top-level.c
 src/gnome-utils/account-quickfill.c
 src/gnome-utils/assistant-xml-encoding.c
 src/gnome-utils/cursors.c
@@ -405,9 +399,6 @@ src/gnome-utils/print-session.c
 src/gnome-utils/search-param.c
 src/gnome-utils/tree-view-utils.c
 src/gnome-utils/window-main-summarybar.c
-src/gnome/window-autoclear.c
-src/gnome/window-reconcile2.c
-src/gnome/window-reconcile.c
 src/html/gnc-html.c
 src/html/gnc-html-factory.c
 src/html/gnc-html-history.c
@@ -474,6 +465,9 @@ src/import-export/ofx/gnc-ofx-import.c
 src/import-export/ofx/gnc-ofx-kvp.c
 src/import-export/ofx/gnc-plugin-ofx.c
 [type: gettext/gsettings]src/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in
+src/import-export/qif/qif-context.c
+src/import-export/qif/qif-file.c
+src/import-export/qif/qif-objects.c
 src/import-export/qif-imp/assistant-qif-import.c
 src/import-export/qif-imp/assistant-qif-import.glade
 src/import-export/qif-imp/dialog-account-picker.c
@@ -490,9 +484,6 @@ src/import-export/qif-imp/qif-objects.scm
 src/import-export/qif-imp/qif-parse.scm
 src/import-export/qif-imp/qif-to-gnc.scm
 src/import-export/qif-imp/qif-utils.scm
-src/import-export/qif/qif-context.c
-src/import-export/qif/qif-file.c
-src/import-export/qif/qif-objects.c
 src/libqof/qof/gnc-aqbanking-templates.cpp
 src/libqof/qof/gnc-date.cpp
 src/libqof/qof/gnc-datetime.cpp
@@ -518,16 +509,6 @@ src/libqof/qof/qofsession.cpp
 src/libqof/qof/qof-string-cache.cpp
 src/libqof/qof/qofutil.cpp
 src/libqof/qof/qof-win32.cpp
-src/optional/gtkmm/gncmm/Account.cpp
-src/optional/gtkmm/gncmm/Book.cpp
-src/optional/gtkmm/gncmm/Commodity.cpp
-src/optional/gtkmm/gncmm/GncInstance.cpp
-src/optional/gtkmm/gncmm/Numeric.cpp
-src/optional/gtkmm/gncmm/Split.cpp
-src/optional/gtkmm/gncmm/Transaction.cpp
-src/optional/gtkmm/gncmm/wrap_init.cpp
-src/optional/gtkmm/gncmod-gtkmm.cpp
-src/optional/gtkmm/gnc-plugin-gtkmm.cpp
 src/plugins/bi_import/dialog-bi-import.c
 src/plugins/bi_import/dialog-bi-import-gui.c
 src/plugins/bi_import/dialog-bi-import-helper.c
@@ -702,5 +683,3 @@ src/gnome/gnucash.appdata.xml.in
 src/gnome/gnucash.desktop.in.in
 src/libqof/qof/qofbookslots.h
 doc/tip_of_the_day.list.in
-lib/goffice/go-charmap-sel.c
-lib/goffice/go-optionmenu.c
diff --git a/src/Makefile.am b/src/Makefile.am
index eb18b893b8..520e33fa86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,22 @@ MAINTAINERCLEANFILES = swig-runtime.h
 
 EXTRA_DIST = \
   base-typemaps.i \
+  cmake_modules/MacroAppendForeach.cmake \
+  cmake_modules/GncAddSwigCommand.cmake \
+  cmake_modules/GncAddTest.cmake \
+  cmake_modules/MakeDist.cmake \
+  cmake_modules/COPYING-CMAKE-SCRIPTS.txt \
+  cmake_modules/MakeDistFiles.cmake \
+  cmake_modules/MacroAddSourceFileCompileFlags.cmake \
+  cmake_modules/MakeDistCheck.cmake \
+  cmake_modules/GncConfigure.cmake \
+  cmake_modules/GncAddSchemeTargets.cmake \
+  cmake_modules/GncAddGSchemaTargets.cmake \
+  cmake_modules/GncFindPkgConfig.cmake \
+  cmake_modules/CMakeLists.txt \
+  config.h.cmake.in \
   README.modules \
   gnc-test-env.pl \
   guile-mappings.h \
-  platform.h
+  platform.h \
+  CMakeLists.txt
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 8f6206bb21..26660604fb 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -172,7 +172,8 @@ EXTRA_DIST = \
   app-utils.i \
   ${gncscmmod_DATA} \
   ${gncscm_DATA} \
-  ${prefsmigration_DATA}
+  ${prefsmigration_DATA} \
+  CMakeLists.txt
 
 if OS_WIN32
 libgncmod_app_utils_la_SOURCES += gnc-help-utils.c
diff --git a/src/app-utils/test/CMakeLists.txt b/src/app-utils/test/CMakeLists.txt
index f4939ba800..d1a1b7d610 100644
--- a/src/app-utils/test/CMakeLists.txt
+++ b/src/app-utils/test/CMakeLists.txt
@@ -11,6 +11,8 @@ SET(APP_UTILS_TEST_INCLUDE_DIRS
 
 SET(APP_UTILS_TEST_LIBS gncmod-app-utils gncmod-test-engine gnc-qof test-core ${GUILE_LDFLAGS})
 
+SET(test_app_utils_SOURCES test-app-utils.c test-option-util.cpp test-gnc-ui-util.c)
+
 MACRO(ADD_APP_UTILS_TEST _TARGET _SOURCE_FILES)
   GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" APP_UTILS_TEST_INCLUDE_DIRS APP_UTILS_TEST_LIBS)
 ENDMACRO()
@@ -26,8 +28,10 @@ GNC_ADD_TEST_WITH_GUILE(test-scm-query-string test-scm-query-string.cpp
 ADD_APP_UTILS_TEST(test-sx test-sx.cpp)
 
 GNC_ADD_SCHEME_TEST(scm-test-load-module test-load-module.in)
+# Doesn't work yet:
+#ADD_APP_UTILS_TEST(test-app-utils "${test_app_utils_SOURCES}")
 
 CONFIGURE_FILE(test-load-module.in test-load-module @ONLY)
 
 SET_DIST_LIST(test_app_utils_DIST CMakeLists.txt Makefile.am test-exp-parser.c test-link-module.c test-load-module.in
-        test-print-parse-amount.cpp test-print-queries.cpp test-scm-query-string.cpp test-sx.cpp)
\ No newline at end of file
+        test-print-parse-amount.cpp test-print-queries.cpp test-scm-query-string.cpp test-sx.cpp ${test_app_utils_SOURCES})
diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am
index 8ff6b80fdc..df77543f3d 100644
--- a/src/app-utils/test/Makefile.am
+++ b/src/app-utils/test/Makefile.am
@@ -49,7 +49,9 @@ LDADD = \
    ${GUILE_LIBS}
 
 EXTRA_DIST += \
-  test-load-module
+  test-load-module \
+  test-print-queries.cpp \
+  CMakeLists.txt
 
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 6ac60ba7aa..e30757a940 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -3,3 +3,4 @@ if WITH_DBI
 endif
 SUBDIRS = xml sql ${DBI_DIR}
 
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/backend/dbi/CMakeLists.txt b/src/backend/dbi/CMakeLists.txt
index 3769bb4346..949889a99a 100644
--- a/src/backend/dbi/CMakeLists.txt
+++ b/src/backend/dbi/CMakeLists.txt
@@ -15,6 +15,7 @@ SET (backend_dbi_noinst_HEADERS
   gnc-dbisqlresult.hpp
   gnc-dbisqlconnection.hpp
   gnc-dbiprovider.hpp
+  gnc-dbiproviderimpl.hpp
 )
 
 SET_LOCAL_DIST(backend_dbi_DIST_local
diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am
index 800f5eec36..67f85d63b6 100644
--- a/src/backend/dbi/Makefile.am
+++ b/src/backend/dbi/Makefile.am
@@ -44,3 +44,5 @@ libgncmod_backend_dbi_la_LIBADD = \
    ${LIBDBI_LIBS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am
index 50c5fb5113..6a7bd140b3 100644
--- a/src/backend/dbi/test/Makefile.am
+++ b/src/backend/dbi/test/Makefile.am
@@ -46,7 +46,8 @@ TESTS_ENVIRONMENT = \
 EXTRA_DIST += \
     test-dbi-stuff.h \
     test-dbi-business-stuff.h \
-    test-dbi.xml
+    test-dbi.xml \
+    CMakeLists.txt
 
 check_PROGRAMS = test-backend-dbi
 
diff --git a/src/backend/sql/Makefile.am b/src/backend/sql/Makefile.am
index 787f936d8d..795a018d20 100644
--- a/src/backend/sql/Makefile.am
+++ b/src/backend/sql/Makefile.am
@@ -82,3 +82,5 @@ libgnc_backend_sql_la_LIBADD = \
    ${top_builddir}/src/libqof/qof/libgnc-qof.la
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
+
+EXTRA_DIST += CMakeLists.txt
diff --git a/src/backend/sql/test/Makefile.am b/src/backend/sql/test/Makefile.am
index 2e396a3d78..d07c554f7a 100644
--- a/src/backend/sql/test/Makefile.am
+++ b/src/backend/sql/test/Makefile.am
@@ -71,3 +71,5 @@ test_sqlbe_CFLAGS = \
 	-I$(top_srcdir)/src/libqof/qof/ \
 	-I$(top_srcdir)/src/test-core/ \
 	$(GLIB_CFLAGS)
+
+EXTRA_DIST += CMakeLists.txt
diff --git a/src/backend/xml/Makefile.am b/src/backend/xml/Makefile.am
index e64da12dec..9362f4d3e8 100644
--- a/src/backend/xml/Makefile.am
+++ b/src/backend/xml/Makefile.am
@@ -106,3 +106,5 @@ libgncmod_backend_xml_la_LIBADD = \
    ${top_builddir}/src/libqof/qof/libgnc-qof.la
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am
index 1ede9f2237..428f4ed2d1 100644
--- a/src/backend/xml/test/Makefile.am
+++ b/src/backend/xml/test/Makefile.am
@@ -281,6 +281,7 @@ EXTRA_DIST = \
   grab-types.pl \
   test-dom-parser1.cpp \
   test-real-data.sh \
-  test-xml2-is-file.cpp
+  test-xml2-is-file.cpp \
+  CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
diff --git a/src/backend/xml/test/test-files/Makefile.am b/src/backend/xml/test/test-files/Makefile.am
index 4e53d89a0b..08b8e6b370 100644
--- a/src/backend/xml/test/test-files/Makefile.am
+++ b/src/backend/xml/test/test-files/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = xml2
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/backend/xml/test/test-files/xml2/Makefile.am b/src/backend/xml/test/test-files/xml2/Makefile.am
index 30ae50fa92..5ded68ed1f 100644
--- a/src/backend/xml/test/test-files/xml2/Makefile.am
+++ b/src/backend/xml/test/test-files/xml2/Makefile.am
@@ -14,7 +14,9 @@ ACCT_TST_FILES = \
 	ms-money.gml2 \
 	pricedb1.gml2 
 
-EXTRA_DIST = $(ACCT_TST_FILES)
+EXTRA_DIST = \
+	$(ACCT_TST_FILES) \
+	CMakeLists.txt
 
 check:
 	for file in $(ACCT_TST_FILES); do			\
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index d52fdf1af7..11f207063f 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -142,8 +142,9 @@ CLEANFILES += ${gnc_common_scripts}
 endif
 
 EXTRA_DIST = \
-    generate-gnc-script \
+	generate-gnc-script \
 	gnucash-valgrind.in \
-	environment.in
+	environment.in \
+	CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.bin\"
diff --git a/src/bin/overrides/Makefile.am b/src/bin/overrides/Makefile.am
index 74fb50ad12..29bbe10822 100644
--- a/src/bin/overrides/Makefile.am
+++ b/src/bin/overrides/Makefile.am
@@ -8,7 +8,8 @@ EXTRA_DIST = \
   gnucash-env.in \
   gnucash-build-env.in \
   gnucash-make-guids \
-  guile.in 
+  guile.in \
+  CMakeLists.txt
 
 noinst_DATA = gnucash-build-env guile
 
diff --git a/src/bin/test/Makefile.am b/src/bin/test/Makefile.am
index 869b7768b3..b8d3ad4f75 100644
--- a/src/bin/test/Makefile.am
+++ b/src/bin/test/Makefile.am
@@ -4,4 +4,6 @@ TESTS = test-version
 TESTS_ENVIRONMENT = \
 	PATH="..:${PATH}"
 
-EXTRA_DIST = test-version
+EXTRA_DIST = \
+	test-version \
+	CMakeLists.txt
diff --git a/src/business/Makefile.am b/src/business/Makefile.am
index f6306095e3..4a62eea59f 100644
--- a/src/business/Makefile.am
+++ b/src/business/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = \
   business-ledger \
   business-gnome
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index a9d87bb087..06007ad142 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -87,7 +87,8 @@ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
 gncscmmod_DATA = business-gnome.scm
 
 EXTRA_DIST = \
-  ${gncscmmod_DATA}
+  ${gncscmmod_DATA} \
+  CMakeLists.txt
 
 if GNUCASH_SEPARATE_BUILDDIR
 #Only needed when srcdir and builddir are different
diff --git a/src/business/business-gnome/gschemas/Makefile.am b/src/business/business-gnome/gschemas/Makefile.am
index 5ee85d1207..83eeea4e29 100644
--- a/src/business/business-gnome/gschemas/Makefile.am
+++ b/src/business/business-gnome/gschemas/Makefile.am
@@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/business/business-gnome/gtkbuilder/Makefile.am b/src/business/business-gnome/gtkbuilder/Makefile.am
index 71fd13c7b0..9c3e52bad7 100644
--- a/src/business/business-gnome/gtkbuilder/Makefile.am
+++ b/src/business/business-gnome/gtkbuilder/Makefile.am
@@ -14,4 +14,5 @@ gtkbuilder_DATA = \
   dialog-vendor.glade
 
 EXTRA_DIST = \
-  ${gtkbuilder_DATA}
+  ${gtkbuilder_DATA} \
+  CMakeLists.txt
diff --git a/src/business/business-gnome/ui/Makefile.am b/src/business/business-gnome/ui/Makefile.am
index 460a3f4961..67923dff9f 100644
--- a/src/business/business-gnome/ui/Makefile.am
+++ b/src/business/business-gnome/ui/Makefile.am
@@ -4,4 +4,4 @@ ui_DATA = \
 	gnc-plugin-page-invoice-ui.xml \
 	gnc-plugin-page-owner-tree-ui.xml
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
diff --git a/src/business/business-ledger/Makefile.am b/src/business/business-ledger/Makefile.am
index 6107c8ea16..77bac56688 100644
--- a/src/business/business-ledger/Makefile.am
+++ b/src/business/business-ledger/Makefile.am
@@ -42,3 +42,5 @@ AM_CPPFLAGS = \
   ${GLIB_CFLAGS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.ledger\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index 57ac0b06df..38b6178616 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -129,7 +129,13 @@ endif
 
 noinst_DATA = .scm-links
 BUILT_SOURCES = gncla-dir.h gnc-version.h
-EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-vcs-info.h
+EXTRA_DIST = \
+  $(gncscmmod_DATA) \
+  core-utils.i \
+  gncla-dir.h.in \
+  gnc-vcs-info.h \
+  CMakeLists.txt
+
 clean-local:
 	rm -rf gnucash
 
diff --git a/src/core-utils/test/Makefile.am b/src/core-utils/test/Makefile.am
index c03d3b855b..1c78d346ae 100644
--- a/src/core-utils/test/Makefile.am
+++ b/src/core-utils/test/Makefile.am
@@ -49,7 +49,8 @@ test_gnc_glib_utils_CFLAGS = \
         -I${top_srcdir}/${MODULEPATH} \
         ${GLIB_CFLAGS}
 
-EXTRA_DIST +=
+EXTRA_DIST += \
+	CMakeLists.txt
 
 clean-local:
 	rm -f translog.*
diff --git a/src/debug/Makefile.am b/src/debug/Makefile.am
index c5aa9de8e2..a799a3a7a3 100644
--- a/src/debug/Makefile.am
+++ b/src/debug/Makefile.am
@@ -1,3 +1,4 @@
-
 SUBDIRS = \
   valgrind
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/debug/valgrind/Makefile.am b/src/debug/valgrind/Makefile.am
index e9a4d2ffe1..a7e7cdb15e 100644
--- a/src/debug/valgrind/Makefile.am
+++ b/src/debug/valgrind/Makefile.am
@@ -6,4 +6,5 @@ EXTRA_DIST = \
   valgrind-libfontconfig.supp \
   valgrind-libgda.supp \
   valgrind-libguile.supp \
-  valgrind-x11.supp
+  valgrind-x11.supp \
+  CMakeLists.txt
diff --git a/src/doc/Makefile.am b/src/doc/Makefile.am
index b413f3c062..4c6124dd99 100644
--- a/src/doc/Makefile.am
+++ b/src/doc/Makefile.am
@@ -25,7 +25,8 @@ EXTRA_DIST = \
   qif.txt \
   tax.txt \
   user-prefs-howto.txt \
-  python-bindings-doxygen.py
+  python-bindings-doxygen.py \
+  CMakeLists.txt
 
 
 all:
diff --git a/src/doc/design/Makefile.am b/src/doc/design/Makefile.am
index a938d6f5cc..401fccb61b 100644
--- a/src/doc/design/Makefile.am
+++ b/src/doc/design/Makefile.am
@@ -17,3 +17,5 @@ gnucash_design_TEXINFOS = \
 # have a version skew between automake and texinfo.
 DISTCLEANFILES = gnucash-design.cps gnucash-design.fns gnucash-design.tps
 MAINTAINERCLEANFILES = gnucash-design.info gnucash-design.info-[0-9]*
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/doc/xml/Makefile.am b/src/doc/xml/Makefile.am
index cbc4b1d25a..25205e2469 100644
--- a/src/doc/xml/Makefile.am
+++ b/src/doc/xml/Makefile.am
@@ -9,4 +9,5 @@ EXTRA_DIST = \
   preferences-v1.dtd \
   prices-v1.dtd \
   transactions-v2.dtd \
-  types.dtd
+  types.dtd \
+  CMakeLists.txt
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index bf51710ecc..a37c4bc306 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -171,7 +171,8 @@ EXTRA_DIST = \
   engine-common.i \
   business-core.i \
   ${gncscmmod_DATA} \
-  ${gncscm_DATA}
+  ${gncscm_DATA} \
+  CMakeLists.txt
 
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
diff --git a/src/engine/test-core/Makefile.am b/src/engine/test-core/Makefile.am
index 7033bb6cab..98a41fb44e 100644
--- a/src/engine/test-core/Makefile.am
+++ b/src/engine/test-core/Makefile.am
@@ -25,3 +25,5 @@ AM_CPPFLAGS = \
   ${GLIB_CFLAGS} \
   ${GUILE_CFLAGS} \
   ${BOOST_CPPFLAGS}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index caa6b52394..fa264f393f 100644
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@@ -128,7 +128,8 @@ EXTRA_DIST += \
   test-scm-query-import \
   test-scm-query-import.scm \
   $(SCM_TEST_HELPERS) \
-  $(SCM_TEST_SRCS)
+  $(SCM_TEST_SRCS) \
+  CMakeLists.txt
 
 TEST_PROGS += test-engine
 
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 8de3f7bc4d..2a413f6ca3 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -44,7 +44,8 @@ endif
 
 EXTRA_DIST = \
   ${gncscmmod_DATA} \
-  gnc-module.i
+  gnc-module.i \
+  CMakeLists.txt
 
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
diff --git a/src/gnc-module/test/Makefile.am b/src/gnc-module/test/Makefile.am
index 843a5d890f..53edbff07c 100644
--- a/src/gnc-module/test/Makefile.am
+++ b/src/gnc-module/test/Makefile.am
@@ -67,7 +67,8 @@ EXTRA_DIST = \
   test-scm-dynload \
   test-scm-init \
   test-scm-module \
-  test-scm-multi
+  test-scm-multi \
+  CMakeLists.txt
 
 foo:
 	${TESTS_ENVIRONMENT} strace -f -o xxx ./test-load-c
diff --git a/src/gnc-module/test/misc-mods/Makefile.am b/src/gnc-module/test/misc-mods/Makefile.am
index 29c457c702..0fc33124ce 100644
--- a/src/gnc-module/test/misc-mods/Makefile.am
+++ b/src/gnc-module/test/misc-mods/Makefile.am
@@ -26,3 +26,5 @@ libgncmod_agedver_la_LIBADD = \
   $(GLIB_LIBS)
 
 CLEANFILES = *.so* *.a
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am
index fc626dd987..d0e38f3c79 100644
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@@ -36,7 +36,8 @@ endif
 
 EXTRA_DIST = \
   bar.i \
-  gnucash/bar.scm
+  gnucash/bar.scm \
+  CMakeLists.txt
 
 BUILT_SOURCES = swig-bar.c
 MAINTAINERCLEANFILES = swig-bar.c
diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am
index 98474d5ab7..853ec3eb18 100644
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@@ -40,7 +40,8 @@ endif
 
 EXTRA_DIST = \
   baz.i \
-  gnucash/baz.scm
+  gnucash/baz.scm \
+  CMakeLists.txt
 
 BUILT_SOURCES = swig-baz.c
 MAINTAINERCLEANFILES = swig-baz.c
diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am
index ee7862c888..401eb21b34 100644
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@@ -25,7 +25,8 @@ libgncmodfoo_la_LIBADD = \
 
 EXTRA_DIST = \
   foo.i \
-  gnucash/foo.scm
+  gnucash/foo.scm \
+  CMakeLists.txt
 
 if BUILDING_FROM_VCS
 swig-foo.c: foo.i
diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am
index c3aa4d369f..79e4bbc1fe 100644
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@@ -61,6 +61,7 @@ gtkbuilder_DATA = \
   dialog-search.glade
 
 EXTRA_DIST = \
-  ${gtkbuilder_DATA}
+  ${gtkbuilder_DATA} \
+  CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.search\"
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index d11c762862..b8becc99fe 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -249,7 +249,8 @@ EXTRA_DIST = \
   make-gnc-warnings-c.xsl \
   make-gnc-warnings-h.xsl \
   ${gncscmmod_DATA} \
-  ${gncscm_DATA}
+  ${gncscm_DATA} \
+  CMakeLists.txt
 
 
 if GNUCASH_SEPARATE_BUILDDIR
diff --git a/src/gnome-utils/gschemas/Makefile.am b/src/gnome-utils/gschemas/Makefile.am
index 9be9da3548..58bb8728c4 100644
--- a/src/gnome-utils/gschemas/Makefile.am
+++ b/src/gnome-utils/gschemas/Makefile.am
@@ -9,3 +9,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/gnome-utils/gtkbuilder/Makefile.am b/src/gnome-utils/gtkbuilder/Makefile.am
index a82116233d..ee97918de8 100644
--- a/src/gnome-utils/gtkbuilder/Makefile.am
+++ b/src/gnome-utils/gtkbuilder/Makefile.am
@@ -19,4 +19,4 @@ gtkbuilder_DATA = \
   gnc-recurrence.glade \
   gnc-tree-view-owner.glade 
 
-EXTRA_DIST = $(gtkbuilder_DATA)
+EXTRA_DIST = $(gtkbuilder_DATA) CMakeLists.txt
diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am
index 02ea939234..34c0856ff6 100644
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@@ -70,7 +70,8 @@ test_link_module_LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la
 
 EXTRA_DIST = \
-  test-load-module
+  test-load-module \
+  CMakeLists.txt
 
 testit:
 	libtool --mode execute gdb test-link-module
diff --git a/src/gnome-utils/ui/Makefile.am b/src/gnome-utils/ui/Makefile.am
index 446dca2e97..3f82751ffd 100644
--- a/src/gnome-utils/ui/Makefile.am
+++ b/src/gnome-utils/ui/Makefile.am
@@ -5,4 +5,4 @@ ui_DATA = \
 	gnc-windows-menu-ui-quartz.xml \
 	osx_accel_map
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index e02ab3c831..9c6785b63b 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -132,7 +132,8 @@ endif
 EXTRA_DIST = \
   gnome.i \
   $(gnomeapp_in_files) \
-  $(appdata_in_files)
+  $(appdata_in_files) \
+  CMakeLists.txt
 
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
diff --git a/src/gnome/gschemas/Makefile.am b/src/gnome/gschemas/Makefile.am
index 98b8c9b0d3..6e5070ae82 100644
--- a/src/gnome/gschemas/Makefile.am
+++ b/src/gnome/gschemas/Makefile.am
@@ -16,3 +16,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/gnome/gtkbuilder/CMakeLists.txt b/src/gnome/gtkbuilder/CMakeLists.txt
index bd39511d76..f7cf10f8b9 100644
--- a/src/gnome/gtkbuilder/CMakeLists.txt
+++ b/src/gnome/gtkbuilder/CMakeLists.txt
@@ -14,7 +14,9 @@ SET(gnome_GLADE
         assistant-loan.glade
         assistant-stock-split.glade
         dialog-commodities.glade
+        dialog-imap-editor.glade
         dialog-fincalc.glade
+        dialog-find-account.glade
         dialog-lot-viewer.glade
         dialog-new-user.glade
         dialog-price.glade
@@ -22,6 +24,7 @@ SET(gnome_GLADE
         dialog-progress.glade
         dialog-sx.glade
         dialog-tax-info.glade
+        dialog-trans-assoc.glade
         gnc-plugin-page-budget.glade
         gnc-plugin-page-register2.glade
         gnc-plugin-page-register.glade
@@ -29,4 +32,4 @@ SET(gnome_GLADE
         window-reconcile.glade
 )
 
-SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt Makefile.am ${gnome_GLADE})
\ No newline at end of file
+SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt Makefile.am ${gnome_GLADE})
diff --git a/src/gnome/gtkbuilder/Makefile.am b/src/gnome/gtkbuilder/Makefile.am
index 294bf4e6bf..d0d5024043 100644
--- a/src/gnome/gtkbuilder/Makefile.am
+++ b/src/gnome/gtkbuilder/Makefile.am
@@ -22,4 +22,4 @@ gtkbuilder_DATA = \
 	window-autoclear.glade \
 	window-reconcile.glade
 
-EXTRA_DIST = $(gtkbuilder_DATA)
+EXTRA_DIST = $(gtkbuilder_DATA) CMakeLists.txt
diff --git a/src/gnome/ui/Makefile.am b/src/gnome/ui/Makefile.am
index 26cce4cbb9..b599a3e289 100644
--- a/src/gnome/ui/Makefile.am
+++ b/src/gnome/ui/Makefile.am
@@ -20,4 +20,4 @@ ui_DATA = \
 	gnc-sxed-window-ui.xml \
 	gnc-sxed-window-ui-full.xml
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
diff --git a/src/html/Makefile.am b/src/html/Makefile.am
index 82bd628612..16fe948978 100644
--- a/src/html/Makefile.am
+++ b/src/html/Makefile.am
@@ -69,7 +69,8 @@ endif
 endif
 
 EXTRA_DIST = \
-  gnc-html.i
+  gnc-html.i \
+  CMakeLists.txt
 
 CLEANFILES = $(BUILT_SOURCES) gnucash
 MAINTAINERCLEANFILES = swig-gnc-html.c
diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am
index ebf0e3d1f1..1adfdf6d6c 100644
--- a/src/import-export/Makefile.am
+++ b/src/import-export/Makefile.am
@@ -65,6 +65,7 @@ AM_CPPFLAGS = \
 
 EXTRA_DIST = \
   $(gtkbuilder_DATA) \
-  generic-import-design.txt
+  generic-import-design.txt \
+  CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.i-e\"
diff --git a/src/import-export/aqb/Makefile.am b/src/import-export/aqb/Makefile.am
index 1ab1f03858..e006c268ad 100644
--- a/src/import-export/aqb/Makefile.am
+++ b/src/import-export/aqb/Makefile.am
@@ -74,6 +74,10 @@ gtkbuilder_DATA = \
   dialog-ab.glade \
   dialog-ab-pref.glade
 
-EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA} migratable-prefs-aqbanking.xml
+EXTRA_DIST = \
+    ${ui_DATA} \
+    ${gtkbuilder_DATA} \
+    migratable-prefs-aqbanking.xml \
+    CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"
diff --git a/src/import-export/aqb/gschemas/Makefile.am b/src/import-export/aqb/gschemas/Makefile.am
index 4f331f9816..58eaea9d17 100644
--- a/src/import-export/aqb/gschemas/Makefile.am
+++ b/src/import-export/aqb/gschemas/Makefile.am
@@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/aqb/test/Makefile.am b/src/import-export/aqb/test/Makefile.am
index 66cb97637e..b08eef5853 100644
--- a/src/import-export/aqb/test/Makefile.am
+++ b/src/import-export/aqb/test/Makefile.am
@@ -66,3 +66,8 @@ test_aqb_CFLAGS = \
 TESTS_ENVIRONMENT = \
   SRCDIR=${srcdir} \
   G_DEBUG=
+
+EXTRA_DIST += \
+  file-book-hbcislot.gnucash \
+  file-book.gnucash \
+  CMakeLists.txt
diff --git a/src/import-export/csv-exp/Makefile.am b/src/import-export/csv-exp/Makefile.am
index bff332c075..86c142a338 100644
--- a/src/import-export/csv-exp/Makefile.am
+++ b/src/import-export/csv-exp/Makefile.am
@@ -57,6 +57,6 @@ gtkbuilderdir = ${GNC_GTKBUILDER_DIR}
 gtkbuilder_DATA = \
 	assistant-csv-export.glade
 
-EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA)
+EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.export.csv\"
diff --git a/src/import-export/csv-exp/gschemas/Makefile.am b/src/import-export/csv-exp/gschemas/Makefile.am
index bc143a1d61..87fcf8666a 100644
--- a/src/import-export/csv-exp/gschemas/Makefile.am
+++ b/src/import-export/csv-exp/gschemas/Makefile.am
@@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/csv-imp/Makefile.am b/src/import-export/csv-imp/Makefile.am
index 548d55a776..74d01601a6 100644
--- a/src/import-export/csv-imp/Makefile.am
+++ b/src/import-export/csv-imp/Makefile.am
@@ -80,6 +80,6 @@ gtkbuilder_DATA = \
 	assistant-csv-account-import.glade \
 	assistant-csv-trans-import.glade
 
-EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA)
+EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.csv\"
diff --git a/src/import-export/csv-imp/gschemas/Makefile.am b/src/import-export/csv-imp/gschemas/Makefile.am
index a68a1f4518..014a3e3635 100644
--- a/src/import-export/csv-imp/gschemas/Makefile.am
+++ b/src/import-export/csv-imp/gschemas/Makefile.am
@@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/csv-imp/test/CMakeLists.txt b/src/import-export/csv-imp/test/CMakeLists.txt
index 406d61f71c..5fd8cea0ff 100644
--- a/src/import-export/csv-imp/test/CMakeLists.txt
+++ b/src/import-export/csv-imp/test/CMakeLists.txt
@@ -33,4 +33,6 @@ IF (NOT WIN32)
     gtest_csv_imp_INCLUDES gtest_csv_imp_LIBS)
 ENDIF()
 
-SET_DIST_LIST(test_csv_import_DIST CMakeLists.txt Makefile.am sample1.csv ${test_csv_imp_SOURCES})
\ No newline at end of file
+SET_DIST_LIST(test_csv_import_DIST CMakeLists.txt Makefile.am
+    test-tx-import.cpp test-tokenizer.cpp
+    sample1.csv ${test_csv_imp_SOURCES})
diff --git a/src/import-export/csv-imp/test/Makefile.am b/src/import-export/csv-imp/test/Makefile.am
index f66313182d..f0055f4f79 100644
--- a/src/import-export/csv-imp/test/Makefile.am
+++ b/src/import-export/csv-imp/test/Makefile.am
@@ -114,7 +114,8 @@ TESTS_ENVIRONMENT = \
   $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
 
 EXTRA_DIST += \
-  sample1.csv
+  sample1.csv \
+  CMakeLists.txt
 
 
 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.import.csv\"
diff --git a/src/import-export/gschemas/Makefile.am b/src/import-export/gschemas/Makefile.am
index fbe0f51811..f207d6300e 100644
--- a/src/import-export/gschemas/Makefile.am
+++ b/src/import-export/gschemas/Makefile.am
@@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/log-replay/Makefile.am b/src/import-export/log-replay/Makefile.am
index 2a6b21325b..0be39fc546 100644
--- a/src/import-export/log-replay/Makefile.am
+++ b/src/import-export/log-replay/Makefile.am
@@ -42,3 +42,5 @@ dist_ui_DATA = \
 	gnc-plugin-log-replay-ui.xml
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.log-replay\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/ofx/Makefile.am b/src/import-export/ofx/Makefile.am
index eeb77070c1..59fad5c5f0 100644
--- a/src/import-export/ofx/Makefile.am
+++ b/src/import-export/ofx/Makefile.am
@@ -44,6 +44,6 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-ofx-ui.xml
 
-EXTRA_DIST = $(ui_DATA) migratable-prefs-ofx.xml
+EXTRA_DIST = $(ui_DATA) migratable-prefs-ofx.xml CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\"
diff --git a/src/import-export/ofx/gschemas/Makefile.am b/src/import-export/ofx/gschemas/Makefile.am
index b2dc93df75..30ad6106e2 100644
--- a/src/import-export/ofx/gschemas/Makefile.am
+++ b/src/import-export/ofx/gschemas/Makefile.am
@@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/ofx/test/Makefile.am b/src/import-export/ofx/test/Makefile.am
index 00d0a3cdeb..54cc321c1f 100644
--- a/src/import-export/ofx/test/Makefile.am
+++ b/src/import-export/ofx/test/Makefile.am
@@ -9,3 +9,5 @@ test_link_LDADD=\
         $(top_builddir)/src/app-utils/libgncmod-app-utils.la \
 	${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
     ../libgncmod-ofx.la 
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/qif-imp/Makefile.am b/src/import-export/qif-imp/Makefile.am
index 7df0d04e67..790b39d541 100644
--- a/src/import-export/qif-imp/Makefile.am
+++ b/src/import-export/qif-imp/Makefile.am
@@ -72,7 +72,8 @@ EXTRA_DIST = \
   ${gncscm_DATA} \
   ${gtkbuilder_DATA} \
   file-format.txt \
-  $(ui_DATA)
+  $(ui_DATA) \
+  CMakeLists.txt
 
 CLEANFILES =
 
diff --git a/src/import-export/qif-imp/gschemas/Makefile.am b/src/import-export/qif-imp/gschemas/Makefile.am
index b96da51396..87746934cc 100644
--- a/src/import-export/qif-imp/gschemas/Makefile.am
+++ b/src/import-export/qif-imp/gschemas/Makefile.am
@@ -8,3 +8,5 @@ gsettings_SCHEMAS = $(gschema_in_files:.gschema.xml.in=.gschema.xml)
 @GSETTINGS_RULES@
 
 CLEANFILES = $(gsettings_SCHEMAS)
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/qif-imp/test/Makefile.am b/src/import-export/qif-imp/test/Makefile.am
index 35dfc89413..38db8066a6 100644
--- a/src/import-export/qif-imp/test/Makefile.am
+++ b/src/import-export/qif-imp/test/Makefile.am
@@ -15,3 +15,4 @@ test_link_LDADD=../libgncmod-qif-import.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${LIBXML2_LIBS}
 
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/qif/Makefile.am b/src/import-export/qif/Makefile.am
index bf3e024d7d..cff9cdefdf 100644
--- a/src/import-export/qif/Makefile.am
+++ b/src/import-export/qif/Makefile.am
@@ -37,3 +37,5 @@ AM_CPPFLAGS = \
   ${GUILE_CFLAGS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/import-export/qif/test/Makefile.am b/src/import-export/qif/test/Makefile.am
index 13bdda2d2a..71104256f2 100644
--- a/src/import-export/qif/test/Makefile.am
+++ b/src/import-export/qif/test/Makefile.am
@@ -48,4 +48,4 @@ check_PROGRAMS = \
   test-qif
 
 EXTRA_DIST = \
-  test-files/test-1-bank-txn.qif
+  test-files/test-1-bank-txn.qif CMakeLists.txt
diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am
index 024b3a2f65..1d322958ec 100644
--- a/src/import-export/test/Makefile.am
+++ b/src/import-export/test/Makefile.am
@@ -78,3 +78,5 @@ clean-local:
 	rm -f translog.*
 
 distclean-local: clean-local
+
+EXTRA_DIST += CMakeLists.txt
diff --git a/src/libqof/Makefile.am b/src/libqof/Makefile.am
index 954cb50136..3a351536f1 100644
--- a/src/libqof/Makefile.am
+++ b/src/libqof/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = . qof
 
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/libqof/qof/CMakeLists.txt b/src/libqof/qof/CMakeLists.txt
index 78c0ea8339..0ef2525241 100644
--- a/src/libqof/qof/CMakeLists.txt
+++ b/src/libqof/qof/CMakeLists.txt
@@ -125,5 +125,5 @@ SET(qof_test_HEADERS
 
 INSTALL(FILES ${qof_test_HEADERS} DESTINATION libexec/gnucash/src/libqof/qof/test)
 SET_LOCAL_DIST(qof_DIST_local CMakeLists.txt Makefile.am ${gnc_qof_EXTRA_DIST}
-  ${gnc_qof_HEADERS} ${gnc_qof_noinst_HEADERS} ${gnc_qof_SOURCES})
+  ${gnc_qof_HEADERS} ${gnc_qof_noinst_HEADERS} ${gnc_qof_SOURCES} qof-win32.cpp)
 SET(qof_DIST ${qof_DIST_local} ${test_qof_DIST} PARENT_SCOPE) 
diff --git a/src/libqof/qof/Makefile.am b/src/libqof/qof/Makefile.am
index a526cd13a8..418fe93a7a 100644
--- a/src/libqof/qof/Makefile.am
+++ b/src/libqof/qof/Makefile.am
@@ -95,6 +95,9 @@ noinst_HEADERS = \
    qofquery-p.h  \
    qofquerycore-p.h
 
+EXTRA_DIST += \
+  CMakeLists.txt
+
 if OS_WIN32
 libgnc_qof_la_SOURCES += qof-win32.cpp
 else
diff --git a/src/libqof/qof/test/Makefile.am b/src/libqof/qof/test/Makefile.am
index 1f43940b51..304fc6fb6c 100644
--- a/src/libqof/qof/test/Makefile.am
+++ b/src/libqof/qof/test/Makefile.am
@@ -248,3 +248,5 @@ test_qof_CPPFLAGS = \
         -DTESTPROG=test_qof \
         -I$(top_srcdir)/lib/libc \
         ${GLIB_CFLAGS}
+
+EXTRA_DIST += CMakeLists.txt
diff --git a/src/optional/Makefile.am b/src/optional/Makefile.am
index d1a92e5fc2..14cda7ab9d 100644
--- a/src/optional/Makefile.am
+++ b/src/optional/Makefile.am
@@ -5,3 +5,5 @@ if WITH_GTKMM
     GTKMM_DIR=gtkmm
 endif
 SUBDIRS = ${PYTHON_BINDINGS_DIR} ${GTKMM_DIR}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/optional/gtkmm/Makefile.am b/src/optional/gtkmm/Makefile.am
index c0d7787228..f0757a342a 100644
--- a/src/optional/gtkmm/Makefile.am
+++ b/src/optional/gtkmm/Makefile.am
@@ -59,6 +59,6 @@ ui_DATA = gnc-plugin-gtkmm-ui.xml
 gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
 gtkbuilder_DATA =
 
-EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA}
+EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA} CMakeLists.txt
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\"
diff --git a/src/optional/gtkmm/test/Makefile.am b/src/optional/gtkmm/test/Makefile.am
index 7ad1ea408e..631b518ead 100644
--- a/src/optional/gtkmm/test/Makefile.am
+++ b/src/optional/gtkmm/test/Makefile.am
@@ -46,3 +46,5 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/optional/gtkmm \
   ${GTKMM_CFLAGS} \
   ${GLIB_CFLAGS}
+
+EXTRA_DIST += CMakeLists.txt
diff --git a/src/optional/python-bindings/Makefile.am b/src/optional/python-bindings/Makefile.am
index e9364fe7c6..7f9bf9c888 100644
--- a/src/optional/python-bindings/Makefile.am
+++ b/src/optional/python-bindings/Makefile.am
@@ -97,7 +97,9 @@ EXTRA_DIST = \
   example_scripts/test_imbalance_transaction.py \
   example_scripts/rest-api/gnucash_rest.py \
   example_scripts/rest-api/gnucash_simple.py \
-  example_scripts/rest-api/README
+  example_scripts/rest-api/README \
+  example_scripts/CMakeLists.txt \
+  CMakeLists.txt
 
 MAINTAINERCLEANFILES = gnucash_core.c
 
diff --git a/src/optional/python-bindings/tests/Makefile.am b/src/optional/python-bindings/tests/Makefile.am
index 13a23f45d4..8a0d3f6729 100644
--- a/src/optional/python-bindings/tests/Makefile.am
+++ b/src/optional/python-bindings/tests/Makefile.am
@@ -50,4 +50,5 @@ EXTRA_DIST = \
   test_book.py \
   test_split.py \
   test_transaction.py \
-  test_business.py
+  test_business.py \
+  CMakeLists.txt
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 27b4f1f1fb..d47c022916 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -110,7 +110,8 @@ EXTRA_DIST = \
   ${gncicon24_DATA} \
   ${ico_files_hr} \
   ${ico_files_lr} \
-  ${gncscalableicon_DATA}
+  ${gncscalableicon_DATA} \
+  CMakeLists.txt
 
 # Create gnucash-icon.ico
 .PHONY: ico
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index aa11dfe284..ad3351eaad 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,9 +1,13 @@
 SUBDIRS=customer_import bi_import
 EXTRA_DIST = \
+	example/CMakeLists.txt \
 	example/Makefile.am \
 	example/gnc-plugin.example.c \
 	example/gnc-plugin.example.h \
 	example/gncmod-example.c \
+	example/glade/CMakeLists.txt \
 	example/glade/Makefile.am \
+	example/ui/CMakeLists.txt \
 	example/ui/Makefile.am \
-	example/ui/gnc-plugin-example-ui.xml
+	example/ui/gnc-plugin-example-ui.xml \
+	CMakeLists.txt
diff --git a/src/plugins/bi_import/Makefile.am b/src/plugins/bi_import/Makefile.am
index 1506a55508..bf400042c9 100644
--- a/src/plugins/bi_import/Makefile.am
+++ b/src/plugins/bi_import/Makefile.am
@@ -52,3 +52,5 @@ AM_CPPFLAGS = \
   ${GLIB_CFLAGS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/plugins/bi_import/gtkbuilder/Makefile.am b/src/plugins/bi_import/gtkbuilder/Makefile.am
index 43365a88ef..e9b70f7b37 100644
--- a/src/plugins/bi_import/gtkbuilder/Makefile.am
+++ b/src/plugins/bi_import/gtkbuilder/Makefile.am
@@ -1,4 +1,4 @@
 gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
 gtkbuilder_DATA = dialog-bi-import-gui.glade
 
-EXTRA_DIST = ${gtkbuilder_DATA}
+EXTRA_DIST = ${gtkbuilder_DATA} CMakeLists.txt
diff --git a/src/plugins/bi_import/ui/Makefile.am b/src/plugins/bi_import/ui/Makefile.am
index 6368fb5ea8..8545219246 100644
--- a/src/plugins/bi_import/ui/Makefile.am
+++ b/src/plugins/bi_import/ui/Makefile.am
@@ -2,4 +2,4 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-bi-import-ui.xml
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
diff --git a/src/plugins/customer_import/Makefile.am b/src/plugins/customer_import/Makefile.am
index 36735dc1ac..5a3dbf850d 100644
--- a/src/plugins/customer_import/Makefile.am
+++ b/src/plugins/customer_import/Makefile.am
@@ -50,3 +50,5 @@ AM_CPPFLAGS = \
   ${GLIB_CFLAGS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/plugins/customer_import/gtkbuilder/Makefile.am b/src/plugins/customer_import/gtkbuilder/Makefile.am
index da877a3aeb..93c4ba1367 100644
--- a/src/plugins/customer_import/gtkbuilder/Makefile.am
+++ b/src/plugins/customer_import/gtkbuilder/Makefile.am
@@ -1,4 +1,4 @@
 gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
 gtkbuilder_DATA = dialog-customer-import-gui.glade
 
-EXTRA_DIST = ${gtkbuilder_DATA}
+EXTRA_DIST = ${gtkbuilder_DATA} CMakeLists.txt
diff --git a/src/plugins/customer_import/ui/Makefile.am b/src/plugins/customer_import/ui/Makefile.am
index 3535d5a449..25ebdffd4e 100644
--- a/src/plugins/customer_import/ui/Makefile.am
+++ b/src/plugins/customer_import/ui/Makefile.am
@@ -2,4 +2,4 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-customer_import-ui.xml
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
diff --git a/src/plugins/example/glade/Makefile.am b/src/plugins/example/glade/Makefile.am
index 4096c72279..f6c5d6bfab 100644
--- a/src/plugins/example/glade/Makefile.am
+++ b/src/plugins/example/glade/Makefile.am
@@ -1,4 +1,4 @@
 gladedir = $(GNC_GLADE_DIR)
 glade_DATA = 
 
-EXTRA_DIST = ${glade_DATA}
+EXTRA_DIST = ${glade_DATA} CMakeLists.txt
diff --git a/src/plugins/example/ui/Makefile.am b/src/plugins/example/ui/Makefile.am
index 210eee8804..f4d6c903ad 100644
--- a/src/plugins/example/ui/Makefile.am
+++ b/src/plugins/example/ui/Makefile.am
@@ -2,4 +2,4 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-example-ui.xml
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) CMakeLists.txt
diff --git a/src/python/Makefile.am b/src/python/Makefile.am
index 17d5ac9842..22b0184e4b 100644
--- a/src/python/Makefile.am
+++ b/src/python/Makefile.am
@@ -54,7 +54,7 @@ clean-local:
 
 noinst_DATA = .py-links
 
-EXTRA_DIST = ${gncpymod_DATA}
+EXTRA_DIST = ${gncpymod_DATA} CMakeLists.txt
 
 CLEANFILES = .py-links
 DISTCLEANFILES = ${PY_FILE_LINKS}
diff --git a/src/python/pycons/Makefile.am b/src/python/pycons/Makefile.am
index 656e5b2beb..6572cfba14 100644
--- a/src/python/pycons/Makefile.am
+++ b/src/python/pycons/Makefile.am
@@ -10,5 +10,5 @@ pycons_DATA = \
    shell.py \
    simple_plot.py
 
-EXTRA_DIST = ${pycons_DATA}
+   EXTRA_DIST = ${pycons_DATA} CMakeLists.txt
 
diff --git a/src/quotes/Makefile.am b/src/quotes/Makefile.am
index 9780368ca8..5ba58cbc6a 100644
--- a/src/quotes/Makefile.am
+++ b/src/quotes/Makefile.am
@@ -10,7 +10,8 @@ EXTRA_DIST = \
   gnc-fq-dump \
   gnc-fq-helper.in \
   gnc-fq-update.in \
-  gnc-value-portfolio
+  gnc-value-portfolio \
+  CMakeLists.txt
 
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @...@.  This prevents autoconf
diff --git a/src/register/Makefile.am b/src/register/Makefile.am
index de7a97dbc2..5a7ecd3faa 100644
--- a/src/register/Makefile.am
+++ b/src/register/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS=register-core register-gnome ledger-core 
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/ledger-core/Makefile.am b/src/register/ledger-core/Makefile.am
index 432b9f9a96..1eb9578520 100644
--- a/src/register/ledger-core/Makefile.am
+++ b/src/register/ledger-core/Makefile.am
@@ -57,3 +57,5 @@ AM_CPPFLAGS = \
 
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.ledger\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/ledger-core/test/Makefile.am b/src/register/ledger-core/test/Makefile.am
index 46b81a16c2..2029ee58bb 100644
--- a/src/register/ledger-core/test/Makefile.am
+++ b/src/register/ledger-core/test/Makefile.am
@@ -11,3 +11,5 @@ test_link_module_LDADD=\
     ../libgncmod-ledger-core.la
 
 AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/register-core/Makefile.am b/src/register/register-core/Makefile.am
index 86c5d592b3..b5305e67d3 100644
--- a/src/register/register-core/Makefile.am
+++ b/src/register/register-core/Makefile.am
@@ -68,3 +68,5 @@ AM_CPPFLAGS = \
 CLEANFILES = $(BUILT_SOURCES)
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.core\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/register-core/test/Makefile.am b/src/register/register-core/test/Makefile.am
index fe485bc0ee..bf223e9e7e 100644
--- a/src/register/register-core/test/Makefile.am
+++ b/src/register/register-core/test/Makefile.am
@@ -19,6 +19,7 @@ test_link_module_LDADD=\
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ../libgncmod-register-core.la
 
-#EXTRA_DIST = test-load-module
+EXTRA_DIST = CMakeLists.txt
+#            test-load-module
 
 AM_CPPFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
diff --git a/src/register/register-gnome/Makefile.am b/src/register/register-gnome/Makefile.am
index 06311db5e6..0909205472 100644
--- a/src/register/register-gnome/Makefile.am
+++ b/src/register/register-gnome/Makefile.am
@@ -67,3 +67,5 @@ AM_CPPFLAGS = \
   ${GTK_XIM_FLAGS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.gnome\"
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/register/register-gnome/test/Makefile.am b/src/register/register-gnome/test/Makefile.am
index b21e628935..d615f02db3 100644
--- a/src/register/register-gnome/test/Makefile.am
+++ b/src/register/register-gnome/test/Makefile.am
@@ -19,6 +19,7 @@ test_link_module_LDADD = \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ../libgncmod-register-gnome.la
 
-#EXTRA_DIST = test-load-module
+EXTRA_DIST = CMakeLists.txt
+#            test-load-module
 
 AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
diff --git a/src/report/Makefile.am b/src/report/Makefile.am
index 03b7355460..bd41143cff 100644
--- a/src/report/Makefile.am
+++ b/src/report/Makefile.am
@@ -16,3 +16,4 @@ else
 SUBDIRS = $(NONGUI_SUBDIRS)
 endif
 
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/report/business-reports/Makefile.am b/src/report/business-reports/Makefile.am
index a6f2d83361..babf228bed 100644
--- a/src/report/business-reports/Makefile.am
+++ b/src/report/business-reports/Makefile.am
@@ -94,7 +94,8 @@ noinst_DATA = .scm-links
 
 EXTRA_DIST = \
   ${gncscmmod_DATA} \
-  ${gncscmtpl_DATA}
+  ${gncscmtpl_DATA} \
+  CMakeLists.txt
 
 CLEANFILES = .scm-links ${gncscmmodcache_DATA}
 DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/report/jqplot/Makefile.am b/src/report/jqplot/Makefile.am
index 584af39615..610d5f1675 100644
--- a/src/report/jqplot/Makefile.am
+++ b/src/report/jqplot/Makefile.am
@@ -32,5 +32,7 @@ gncjqplot_DATA = \
   plugins/jqplot.trendline.js
 
 # Also ship jquery.js since it is the source for jquery.min.js
-EXTRA_DIST = ${gncjqplot_DATA} \
-	jquery.js
+EXTRA_DIST = \
+	${gncjqplot_DATA} \
+	jquery.js \
+	CMakeLists.txt
diff --git a/src/report/locale-specific/Makefile.am b/src/report/locale-specific/Makefile.am
index da178ad3eb..a40468e2dc 100644
--- a/src/report/locale-specific/Makefile.am
+++ b/src/report/locale-specific/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = us
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am
index b8f3cb5e47..462c462f59 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@@ -101,7 +101,8 @@ noinst_DATA = .scm-links
 
 EXTRA_DIST = \
   ${gncscmmod_DATA} \
-  ${gncscmrpt_DATA}
+  ${gncscmrpt_DATA} \
+  CMakeLists.txt
 
 CLEANFILES = \
 	.scm-links \
diff --git a/src/report/locale-specific/us/test/Makefile.am b/src/report/locale-specific/us/test/Makefile.am
index 712490ed09..03e33bb34f 100644
--- a/src/report/locale-specific/us/test/Makefile.am
+++ b/src/report/locale-specific/us/test/Makefile.am
@@ -26,3 +26,5 @@ testit:
 test_link_module_SOURCES = test-link-module.c
 test_link_module_LDADD= \
   ${top_builddir}/src/report/locale-specific/us/libgncmod-locale-reports-us.la
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 2d0f6a0ca5..9c2a163706 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -81,7 +81,8 @@ EXTRA_DIST = \
   report-gnome.i \
   ${gtkbuilder_DATA} \
   ${gncscmmod_DATA} \
-  ${ui_DATA}
+  ${ui_DATA} \
+  CMakeLists.txt
 
 if GNUCASH_SEPARATE_BUILDDIR
 #Only needed when srcdir and builddir are different
diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am
index 7e68b31c67..103a4fb797 100644
--- a/src/report/report-gnome/test/Makefile.am
+++ b/src/report/report-gnome/test/Makefile.am
@@ -62,4 +62,4 @@ TESTS_ENVIRONMENT = \
 
 check_PROGRAMS = test-link-module
 
-EXTRA_DIST = test-load-module
+EXTRA_DIST = test-load-module CMakeLists.txt
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index 773a85bb6b..07cd4ef1c9 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -149,7 +149,12 @@ endif
 
 noinst_DATA = .scm-links
 
-EXTRA_DIST = report-system.i ${gncscmmod_DATA} ${gncscm_DATA} ${gncmodscm_DATA}
+EXTRA_DIST = \
+	report-system.i \
+	${gncscmmod_DATA} \
+	${gncscm_DATA} \
+	${gncmodscm_DATA} \
+	CMakeLists.txt
 
 clean-local:
 	rm -rf gnucash
diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am
index e93c2c35f4..a62c741ca1 100644
--- a/src/report/report-system/test/Makefile.am
+++ b/src/report/report-system/test/Makefile.am
@@ -77,7 +77,8 @@ SCM_TEST_HELPERS = test-extras.scm
 EXTRA_DIST = \
 	test-load-module \
 	$(SCM_TEST_HELPERS) \
-	$(SCM_TEST_SRCS)
+	$(SCM_TEST_SRCS) \
+	CMakeLists.txt
 
 testit:
 	$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am
index e76474f678..e9678cebed 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@@ -122,7 +122,8 @@ noinst_DATA = .scm-links
 
 EXTRA_DIST = \
 	${gncscmmod_DATA} \
-	${gncscmrpt_DATA}
+	${gncscmrpt_DATA} \
+	CMakeLists.txt
 
 CLEANFILES = \
 	.scm-links \
diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am
index 3b2ca5c603..547738aaab 100644
--- a/src/report/standard-reports/test/Makefile.am
+++ b/src/report/standard-reports/test/Makefile.am
@@ -66,7 +66,8 @@ SCM_TEST_HELPERS = \
 EXTRA_DIST = \
 	test-load-module \
 	$(SCM_TEST_HELPERS) \
-	$(SCM_TEST_SRCS)
+	$(SCM_TEST_SRCS) \
+	CMakeLists.txt
 
 .scm-links:
 	$(RM) -rf gnucash
diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am
index ac4ea43104..0f0798883f 100644
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@@ -109,7 +109,7 @@ uidir = $(GNC_UI_DIR)
 dist_ui_DATA = \
 	gnc-plugin-stylesheets-ui.xml
 
-EXTRA_DIST = ${gncscmmod_DATA}
+EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt
 
 CLEANFILES = .scm-links ${gncscmmodcache_DATA}
 DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/report/stylesheets/test/Makefile.am b/src/report/stylesheets/test/Makefile.am
index 32115923e5..a2f8e5d0fc 100644
--- a/src/report/stylesheets/test/Makefile.am
+++ b/src/report/stylesheets/test/Makefile.am
@@ -36,4 +36,4 @@ TESTS_ENVIRONMENT = \
   GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
 
-EXTRA_DIST = test-load-module
+EXTRA_DIST = test-load-module CMakeLists.txt
diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am
index f2b46b59fe..5fc4770391 100644
--- a/src/report/utility-reports/Makefile.am
+++ b/src/report/utility-reports/Makefile.am
@@ -89,7 +89,7 @@ clean-local:
 
 noinst_DATA = .scm-links
 
-EXTRA_DIST = ${gncscmmod_DATA}
+EXTRA_DIST = ${gncscmmod_DATA} CMakeLists.txt
 
 CLEANFILES = .scm-links ${gncscmmodcache_DATA}
 DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/report/utility-reports/test/Makefile.am b/src/report/utility-reports/test/Makefile.am
index ec5e2324c7..fbfc3ffcd5 100644
--- a/src/report/utility-reports/test/Makefile.am
+++ b/src/report/utility-reports/test/Makefile.am
@@ -32,4 +32,4 @@ TESTS_ENVIRONMENT = \
   GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
 
-EXTRA_DIST = test-load-module
+EXTRA_DIST = test-load-module CMakeLists.txt
diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am
index 960441c7ce..fa1bdd7564 100644
--- a/src/scm/Makefile.am
+++ b/src/scm/Makefile.am
@@ -69,7 +69,8 @@ SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA}
 EXTRA_DIST = \
   build-config.scm.in \
   config \
-  ${SCM_FILES}
+  ${SCM_FILES} \
+  CMakeLists.txt
 
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @...@.  This prevents autoconf
diff --git a/src/scm/gnumeric/Makefile.am b/src/scm/gnumeric/Makefile.am
index 024086aea5..2e12cf6a78 100644
--- a/src/scm/gnumeric/Makefile.am
+++ b/src/scm/gnumeric/Makefile.am
@@ -31,7 +31,8 @@ endif
 noinst_DATA = .scm-links
 
 EXTRA_DIST = \
-  ${gncscm_DATA}
+  ${gncscm_DATA} \
+  CMakeLists.txt
 
 CLEANFILES = .scm-links ${gncscmcache_DATA}
 
diff --git a/src/tax/Makefile.am b/src/tax/Makefile.am
index da178ad3eb..a40468e2dc 100644
--- a/src/tax/Makefile.am
+++ b/src/tax/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = us
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am
index 07d50d6c25..143441acc9 100644
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@@ -78,7 +78,8 @@ noinst_DATA = .scm-links
 
 EXTRA_DIST = \
   ${gncscmmod_DATA} \
-  ${gncscm_DATA}
+  ${gncscm_DATA} \
+  CMakeLists.txt
 
 CLEANFILES = .scm-links ${gncscmmodcache_DATA} ${gncscmcache_DATA}
 
diff --git a/src/tax/us/test/Makefile.am b/src/tax/us/test/Makefile.am
index bab6a0e154..c25bb4388a 100644
--- a/src/tax/us/test/Makefile.am
+++ b/src/tax/us/test/Makefile.am
@@ -15,3 +15,5 @@ TESTS_ENVIRONMENT = \
 check_PROGRAMS=test-link-module
 test_link_module_SOURCES=test-link-module.c
 test_link_module_LDADD=../libgncmod-tax-us.la ${GUILE_LIBS} ${GLIB_LIBS}
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index f8b9414259..5e3edf7d2f 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -136,7 +136,8 @@ EXTRA_DIST = \
   swig-unittest-support-python.c \
   swig-unittest-support-guile.c \
   unittest_support.py \
-  unittest-support.i
+  unittest-support.i \
+  CMakeLists.txt
 
 MAINTAINERCLEANFILES = \
 	swig-unittest-support-guile.c \
diff --git a/test-templates/Makefile.am b/test-templates/Makefile.am
index 2ec0cc68e5..f0f1d380c8 100644
--- a/test-templates/Makefile.am
+++ b/test-templates/Makefile.am
@@ -50,3 +50,5 @@ test_foo_CFLAGS = \
 	${DEFAULT_INCLUDES} \
 	-I$(top_srcdir)/${MODULEPATH}/ \
 	${GLIB_CFLAGS}
+
+EXTRA_DIST = CMakeLists.txt