diff --git a/doc/Makefile.am b/doc/Makefile.am
index ea87a74..f4402f7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,18 +1,38 @@
-all: po4a makepkg.8 FrugalBuild.8 pacman-g2.8
+man_MANS =
+if HAS_ASCIIDOC
+man_MANS += FrugalBuild.5 libpacman.3 makepkg.8 pacman-g2.8
+endif
 
-po4a:
-if HAS_PO4A
+all: mans
+
+mans:
 	@$(NORMAL_INSTALL)
+if HAS_PO4A
 	po4a -k 0 po4a.cfg
+if HAS_ASCIIDOC
+	for i in `grep '\[po4a_langs\]' po4a.cfg |sed 's/\[po4a_langs\] //'`; do \
+		for j in $$i/*.txt; do \
+			a2x -f manpage $$j; \
+		done; \
+	done
 endif
+endif
+if HAS_ASCIIDOC
+	for i in *.txt; do \
+		a2x -f manpage $$i; \
+	done
 
-clean:
-	rm -f man3/*.3
+%.3: %.txt
+	asciidoc -f manpage $^
 
-man_MANS = pacman-g2.8 makepkg.8 FrugalBuild.8 libpacman.3
+%.5: %.txt
+	asciidoc -f manpage $^
 
-if HAS_DOXYGEN
-man_MANS += man3/*.3
+%.8: %.txt
+	asciidoc -f manpage $^
 endif
 
+clean:
+	rm -rf man3 *.xml *.{3,5,8}
+
 EXTRA_DIST = $(man_MANS)