diff --git a/CMakeLists.txt b/CMakeLists.txt
index c64ccc1f81..ec64ef1d7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1255,26 +1255,11 @@ endif()
 option(WITH_DOCS "Build html docs" ON)
 if(WITH_DOCS)
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
-  file(
-    GLOB docs
-    RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/
-    "${CMAKE_CURRENT_SOURCE_DIR}/doc/*.txt")
-  set(html-docs)
-  foreach(txt ${docs})
-    string(REGEX REPLACE ".*/(.*)\\.txt" "\\1.html" html ${txt})
-    set(src ${txt})
-    set(dst doc/${html})
-    if(WITH_DOC)
-      add_custom_command(
-        OUTPUT ${dst}
-        COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b xhtml11 -f ${CMAKE_CURRENT_SOURCE_DIR}/doc/asciidoc.conf
-                -azmq_version=${ZMQ_VERSION} -o ${dst} ${src}
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${src}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Generating ${html}")
-      list(APPEND html-docs ${CMAKE_CURRENT_BINARY_DIR}/${dst})
-    endif()
-  endforeach()
+  add_custom_command(
+    COMMAND asciidoctor -b html -azmq_version=${ZMQ_VERSION} *.adoc
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${src}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Generating ${html}")
 endif()
 
 if(ZMQ_BUILD_FRAMEWORK)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d726a6037e..19b6ebc3a9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -36,7 +36,7 @@ MAN_HTML =
 
 MAINTAINERCLEANFILES =
 
-EXTRA_DIST = asciidoc.conf $(MAN_ADOC)
+EXTRA_DIST = $(MAN_ADOC)
 
 if INSTALL_MAN
 MAN_DOC += $(MAN3) $(MAN7)