diff --git a/Makefile.am b/Makefile.am
index 84090ce7..a056ab7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src
+SUBDIRS = src cmake_modules
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnfc.pc
 
-EXTRA_DIST = Doxyfile pn53x.rules
+EXTRA_DIST = Doxyfile pn53x.rules CMakeLists.txt config.h.cmake LICENSE
 CLEANFILES = Doxygen.log
 
 if DOC_ENABLED
diff --git a/cmake_modules/Makefile.am b/cmake_modules/Makefile.am
new file mode 100644
index 00000000..40699e31
--- /dev/null
+++ b/cmake_modules/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = COPYING-CMAKE-SCRIPTS FindLIBUSB.cmake FindPCSC.cmake UseDoxygen.cmake
diff --git a/configure.ac b/configure.ac
index b51d318c..59215f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ AC_CONFIG_FILES([
 		src/lib/Makefile
 		src/examples/Makefile
 		src/Makefile
+		cmake_modules/Makefile
 		libnfc.pc
 		Doxyfile
 		])
diff --git a/src/Makefile.am b/src/Makefile.am
index 53ff473c..19f46e9b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
-
 INCLUDES = $(LIBNFC_CFLAGS)
 
 SUBDIRS = lib examples include
 
+EXTRA_DIST = CMakeLists.txt
+
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index dfad0ea4..37e24874 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,3 +1,3 @@
-
 SUBDIRS = nfc
 
+EXTRA_DIST = CMakeLists.txt
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c4b1682e..a1b7b2b1 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -22,4 +22,4 @@ if LIBUSB_ENABLED
   libnfc_la_LIBADD  += @LIBUSB_LIBS@
 endif
 
-EXTRA_DIST = chips.h buses.h drivers.h bitutils.h
\ No newline at end of file
+EXTRA_DIST = CMakeLists.txt chips.h buses.h drivers.h bitutils.h