diff --git a/doc/Makefile b/doc/Makefile
index 743bf05c4..959ca52e3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -125,10 +125,8 @@ RBRACKET=)
 $(MARKDOWN_WITH_SCHEMA): doc/lightning-%.7.md: doc/schemas/%.schema.json tools/fromschema.py
 	@if $(call SHA256STAMP_CHANGED); then $(call VERBOSE, "fromschema $@", tools/fromschema.py --markdownfile=$@ doc/schemas/$*.schema.json > $@.tmp && grep -v SHA256STAMP: $@.tmp > $@ && rm -f $@.tmp && $(call SHA256STAMP,[comment]: # $(LBRACKET),$(RBRACKET))); else touch $@; fi
 
-# mrkd doesn't format nested lists properly, so we fixup with sed (see doc/lightning-connect.7
-# and https://github.com/refi64/mrkd/issues/4
-$(MANPAGES): doc/%: doc/%.md
-	@if $(call SHA256STAMP_CHANGED); then $(call VERBOSE, "mrkd $<", mrkd $< $@.tmp && sed -e 's/\(.\)\.RS$$/\1\n.RS/' < $@.tmp > $@ && rm $@.tmp && $(call SHA256STAMP,\\\",)); else touch $@; fi
+$(MANPAGES): doc/%: doc/%.md tools/md2man.sh version_gen.h
+	@if $(call SHA256STAMP_CHANGED_ALL); then $(call VERBOSE, "md2man $<", VERSION=$(VERSION) tools/md2man.sh $< > $@ && $(call SHA256STAMP_ALL,\\\",)); else touch $@; fi
 
 $(MANPAGES): $(FORCE)
 $(MARKDOWN_WITH_SCHEMA): $(FORCE)