diff --git a/Makefile.am b/Makefile.am
index dd892c820..d3ce7b507 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,16 @@
 ACLOCAL_AMFLAGS = -I config
 
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
-SUBDIRS = config src templates doc hooks
-DIST_SUBDIRS = config src templates doc hooks
-EXTRA_DIST = \
-	autogen.sh \
-	lxc.spec \
-	CONTRIBUTING \
-	MAINTAINERS
+SUBDIRS = config coccinelle src templates doc hooks
+DIST_SUBDIRS = config coccinelle  src templates doc hooks
+EXTRA_DIST = autogen.sh \
+	     lxc.spec \
+	     CONTRIBUTING \
+	     CODING_STYLE.md \
+	     LICENSE.GPL2 \
+	     LICENSE.LGPL2.1 \
+	     MAINTAINERS \
+	     README.md
 
 RPMARGS =
 
diff --git a/coccinelle/Makefile.am b/coccinelle/Makefile.am
new file mode 100644
index 000000000..a3c8b03d9
--- /dev/null
+++ b/coccinelle/Makefile.am
@@ -0,0 +1,7 @@
+# Makefile.am
+
+EXTRA_DIST = exit.cocci \
+	     run-coccinelle.sh \
+	     while-true.cocci
+
+bin_SCRIPTS = run-coccinelle.sh
diff --git a/configure.ac b/configure.ac
index 3b4cd5730..35cb76f76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -797,6 +797,8 @@ AC_CONFIG_FILES([
 	lxc.pc
 	lxc.spec
 
+	coccinelle/Makefile
+
 	config/Makefile
 	config/apparmor/Makefile
 	config/apparmor/abstractions/start-container
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 29abd0154..d613a75cb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,10 +9,10 @@ if ENABLE_API_DOCS
 SUBDIRS += api
 endif
 
-EXTRA_DIST = \
-	lxc.container.conf \
-	lxc.system.conf \
-	FAQ.txt
+EXTRA_DIST = api-extensions.md \
+	     lxc.container.conf \
+	     lxc.system.conf \
+	     FAQ.txt
 
 if ENABLE_DOCBOOK
 man_MANS = lxc.conf.5 \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index d05021a05..493b33c9d 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -158,6 +158,7 @@ EXTRA_DIST = basic.c \
 	     lxc-test-checkpoint-restore \
 	     lxc-test-cloneconfig \
 	     lxc-test-createconfig \
+	     lxc-test-exit-code \
 	     lxc-test-no-new-privs \
 	     lxc-test-snapdeps \
 	     lxc-test-symlink \
@@ -172,7 +173,8 @@ EXTRA_DIST = basic.c \
 	     snapshot.c \
 	     startone.c \
 	     state_server.c \
-	     share_ns.c
+	     share_ns.c \
+	     travis.sh
 
 clean-local:
 	rm -f lxc-test-utils-*