diff --git a/Makefile.am b/Makefile.am
index 4bd07831..c4b86bef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,7 @@ src_libzmq_la_SOURCES = \
 	src/lb.cpp \
 	src/lb.hpp \
 	src/likely.hpp \
+	src/macros.hpp \
 	src/mailbox.cpp \
 	src/mailbox.hpp \
 	src/mailbox_safe.cpp \
diff --git a/ci_build.sh b/ci_build.sh
index 2e55d2e1..9e9f834a 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -27,9 +27,8 @@ if [ $BUILD_TYPE == "default" ]; then
     (
         ./autogen.sh &&
         ./configure "${CONFIG_OPTS[@]}" &&
-        make &&
-        ( if make check; then true; else cat test-suite.log; exit 1; fi ) &&
-        make install
+        export DISTCHECK_CONFIGURE_FLAGS="${CONFIG_OPTS[@]}" &&
+        make VERBOSE=1 distcheck
     ) || exit 1
 else
     cd ./builds/${BUILD_TYPE} && ./ci_build.sh
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 20340fcb..5c32954e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,22 +23,26 @@ MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_disconnect.3 zmq_close.3 \
 MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_inproc.7 zmq_ipc.7 \
     zmq_null.7 zmq_plain.7 zmq_curve.7 zmq_tipc.7 zmq_vmci.7
 
-MAN_DOC = $(MAN1) $(MAN3) $(MAN7)
+MAN_DOC =
 
 MAN_TXT = $(MAN3:%.3=%.txt)
 MAN_TXT += $(MAN7:%.7=%.txt)
-MAN_HTML = $(MAN_TXT:%.txt=%.html)
+MAN_HTML =
 
-MAINTAINERCLEANFILES = $(MAN_DOC) $(MAN_HTML)
+MAINTAINERCLEANFILES =
 
 EXTRA_DIST = asciidoc.conf $(MAN_TXT)
 
 if INSTALL_MAN
+MAN_DOC += $(MAN1) $(MAN3) $(MAN7)
 dist_man_MANS = $(MAN_DOC)
+MAINTAINERCLEANFILES += $(MAN_DOC)
 endif
 
 if BUILD_DOC
+MAN_HTML += $(MAN_TXT:%.txt=%.html)
 EXTRA_DIST += $(MAN_HTML)
+MAINTAINERCLEANFILES += $(MAN_HTML)
 
 SUFFIXES=.html .txt .xml .3 .7