diff --git a/Makefile b/Makefile
index 946f2a49..c02883b7 100644
--- a/Makefile
+++ b/Makefile
@@ -15,34 +15,20 @@ RESULTS ?= results
 
 all: docs
 
-docs: html pdf epub man
-
-html:
-	asciidoc docs/ngcpcfg.txt
-
-pdf:
-	a2x --icons -a toc -a toclevels=3 -a docinfo -f pdf docs/ngcpcfg.txt
-
-epub:
-	a2x --icons -a toc -a toclevels=3 -a docinfo -f epub docs/ngcpcfg.txt
+docs: man
 
 man:
-	asciidoc -d manpage -b docbook docs/ngcpcfg.txt
-	sed -i 's/<emphasis role="strong">/<emphasis role="bold">/' docs/ngcpcfg.xml
-	xsltproc --nonet /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl docs/ngcpcfg.xml
-	pod2man --section=8 sbin/ngcp-network > ngcp-network.8
-	pod2man --section=8 sbin/ngcp-sync-constants > ngcp-sync-constants.8
-	pod2man --section=8 sbin/ngcp-sync-grants > ngcp-sync-grants.8
+	asciidoctor -d manpage -b manpage docs/ngcpcfg.txt
+	pod2man --section=8 sbin/ngcp-network > docs/ngcp-network.8
+	pod2man --section=8 sbin/ngcp-sync-constants > docs/ngcp-sync-constants.8
+	pod2man --section=8 sbin/ngcp-sync-grants > docs/ngcp-sync-grants.8
 
 
 clean:
-	rm -f docs/ngcpcfg.xml docs/ngcpcfg.epub docs/ngcpcfg.html docs/ngcpcfg.pdf
-	rm -f ngcpcfg.8 ngcp-network.8 ngcp-sync-constants.8 ngcp-sync-grants.8
+	rm -f docs/ngcpcfg.8 docs/ngcp-network.8 docs/ngcp-sync-constants.8 docs/ngcp-sync-grants.8
 	rm -rf t/__pycache__ t/fixtures/__pycache__/ t/*.pyc
 
 dist-clean: clean
-	rm -f docs/ngcpcfg.html docs/ngcpcfg.pdf
-	rm -f docs/ngcpcfg.epub ngcpcfg.8
 	rm -rf results
 
 # check for syntax errors
diff --git a/debian/control b/debian/control
index eadc51b9..df65de07 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,8 @@ Maintainer: Sipwise Development Team <support@sipwise.com>
 Homepage: https://www.sipwise.com/
 Standards-Version: 3.9.8
 Build-Depends:
- asciidoc,
+ asciidoctor,
  debhelper-compat (= 12),
- docbook-xsl,
  git,
  libcapture-tiny-perl,
  libclone-perl,
@@ -28,7 +27,6 @@ Build-Depends:
  netcat-openbsd,
  pkwalify,
  python3-pytest,
- xsltproc,
 
 Package: libngcp-template-perl
 Section: perl
diff --git a/debian/ngcp-ngcpcfg.manpages b/debian/ngcp-ngcpcfg.manpages
index d8ef5c39..b97315fa 100644
--- a/debian/ngcp-ngcpcfg.manpages
+++ b/debian/ngcp-ngcpcfg.manpages
@@ -1,4 +1,4 @@
-ngcp-network.8
-ngcp-sync-constants.8
-ngcp-sync-grants.8
-ngcpcfg.8
+docs/ngcp-network.8
+docs/ngcp-sync-constants.8
+docs/ngcp-sync-grants.8
+docs/ngcpcfg.8
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..8703c5cd
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+*.8