diff --git a/Makefile.am b/Makefile.am
index d1a7dd16..a66561f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,19 @@ ACLOCAL_AMFLAGS = -I m4
 dist_doc_DATA = README.rst
 
 EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
-	Dockerfile.android
+	Dockerfile.android \
+	cmakeconfig.h.in \
+	CMakeLists.txt \
+	CMakeOptions.txt \
+	cmake/FindSpdylay.cmake \
+	cmake/ExtractValidFlags.cmake \
+	cmake/FindJemalloc.cmake \
+	cmake/FindLibev.cmake \
+	cmake/FindCUnit.cmake \
+	cmake/Version.cmake \
+	cmake/FindCython.cmake \
+	cmake/FindLibevent.cmake \
+	cmake/FindJansson.cmake
 
 .PHONY: clang-format
 
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 07829e25..089a79b0 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -23,7 +23,11 @@
 
 configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
 
-EXTRA_DIST = $(configfiles:%=%.in) nghttpx-logrotate tlsticketupdate.go
+EXTRA_DIST = \
+	CMakeLists.txt \
+	$(configfiles:%=%.in) \
+	nghttpx-logrotate \
+	tlsticketupdate.go
 
 edit = sed -e 's|@bindir[@]|$(bindir)|g'
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a9ea4349..777fe226 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -154,6 +154,7 @@ RST_FILES = \
 	h2load.1.rst
 
 EXTRA_DIST = \
+	CMakeLists.txt \
 	mkapiref.py \
 	$(RST_FILES) \
 	$(APIDOCS) \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ba00c225..a80949c7 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -21,6 +21,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+EXTRA_DIST = CMakeLists.txt
+
 if ENABLE_EXAMPLES
 
 AM_CFLAGS = $(WARNCFLAGS)
diff --git a/integration-tests/Makefile.am b/integration-tests/Makefile.am
index aab50096..479bfa14 100644
--- a/integration-tests/Makefile.am
+++ b/integration-tests/Makefile.am
@@ -28,6 +28,7 @@ GO_FILES = \
 	server_tester.go
 
 EXTRA_DIST = \
+	CMakeLists.txt \
 	$(GO_FILES) \
 	server.key \
 	server.crt \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3ea5bed2..017e44a7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,7 +22,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 SUBDIRS = includes
 
-EXTRA_DIST = Makefile.msvc
+EXTRA_DIST = Makefile.msvc CMakeLists.txt
 
 AM_CFLAGS = $(WARNCFLAGS) $(EXTRACFLAG)
 AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
diff --git a/lib/includes/Makefile.am b/lib/includes/Makefile.am
index 80af63cc..c07cb4d2 100644
--- a/lib/includes/Makefile.am
+++ b/lib/includes/Makefile.am
@@ -20,4 +20,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+EXTRA_DIST = CMakeLists.txt
+
 nobase_include_HEADERS = nghttp2/nghttp2.h nghttp2/nghttp2ver.h
diff --git a/python/Makefile.am b/python/Makefile.am
index 43aa5491..2d2edd5a 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -25,7 +25,7 @@
 # clean-local in parallel build.
 .NOTPARALLEL:
 
-EXTRA_DIST = cnghttp2.pxd nghttp2.pyx
+EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CMakeLists.txt install-python.cmake.in
 
 if ENABLE_PYTHON_BINDINGS
 
diff --git a/script/Makefile.am b/script/Makefile.am
index fe5d3652..387f33c5 100644
--- a/script/Makefile.am
+++ b/script/Makefile.am
@@ -21,5 +21,5 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-EXTRA_DIST = README.rst
+EXTRA_DIST = README.rst CMakeLists.txt
 dist_pkgdata_SCRIPTS = fetch-ocsp-response
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c2cfa21..5b21aee7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 SUBDIRS = includes
 
+EXTRA_DIST = CMakeLists.txt
+
 bin_PROGRAMS =
 check_PROGRAMS =
 TESTS =
diff --git a/src/includes/Makefile.am b/src/includes/Makefile.am
index abc93c1e..e73d209b 100644
--- a/src/includes/Makefile.am
+++ b/src/includes/Makefile.am
@@ -21,6 +21,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+EXTRA_DIST = CMakeLists.txt
+
 if ENABLE_ASIO_LIB
 nobase_include_HEADERS = nghttp2/asio_http2.h nghttp2/asio_http2_client.h \
 	nghttp2/asio_http2_server.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index efcd7a5d..c3e43925 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 SUBDIRS = testdata
 
+EXTRA_DIST = CMakeLists.txt
+
 if HAVE_CUNIT
 
 check_PROGRAMS = main
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index 6e9bcf27..3b951c8d 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -23,6 +23,8 @@
 
 AM_CPPFLAGS = @DEFS@
 
+EXTRA_DIST = CMakeLists.txt
+
 if ENABLE_THIRD_PARTY
 
 noinst_LTLIBRARIES = libhttp-parser.la
@@ -39,7 +41,7 @@ endif # HAVE_NEVERBLEED
 
 if HAVE_MRUBY
 
-EXTRA_DIST = build_config.rb mruby/*
+EXTRA_DIST += build_config.rb mruby/*
 
 .PHONY: all-local clean mruby