diff --git a/.cirrus.yml b/.cirrus.yml
index 54ce8ba..cb158e1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -17,7 +17,7 @@ env:
     # Save a little typing (path relative to $CIRRUS_WORKING_DIR)
     SCRIPT_BASE: "./contrib/cirrus"
     FEDORA_NAME: "fedora-38"
-    IMAGE_SUFFIX: "c20230807t144831z-f38f37d13"
+    IMAGE_SUFFIX: "c20230809t143240z-f38f37d13"
     FEDORA_NETAVARK_IMAGE: "fedora-netavark-${IMAGE_SUFFIX}"
     AARDVARK_DNS_BRANCH: "main"
     AARDVARK_DNS_URL: "https://api.cirrus-ci.com/v1/artifact/github/containers/aardvark-dns/success/binary.zip?branch=${AARDVARK_DNS_BRANCH}"
diff --git a/README.md b/README.md
index 253f7bc..a9deabc 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Netavark is a tool for configuring networking for Linux containers. Its features
 
 ## Requires
 
+- [go-md2man](https://github.com/cpuguy83/go-md2man)
 - [Rust](https://www.rust-lang.org/tools/install)
 - [Podman](https://podman.io/docs) 4.0+
 
diff --git a/docs/Makefile b/docs/Makefile
index 72c8cbd..7587b40 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,16 +1,17 @@
 PREFIX ?= /usr/local
 DATADIR ?= ${PREFIX}/share
 MANDIR ?= $(DATADIR)/man
-MANDOWN ?= mandown
+GO ?= go
+GOMD2MAN ?= go-md2man
 
 docs: $(patsubst %.md,%,$(wildcard *.1.md))
 
 %.1: %.1.md
-	$(MANDOWN) $< > $@
+	$(GOMD2MAN) -in $^ -out $@
 
-.PHONY: .install.mandown
-.install.mandown:
-	cargo install mandown
+.PHONY: .install.md2man
+.install.md2man:
+	$(GO) install github.com/cpuguy83/go-md2man/v2@latest
 
 .PHONY: install
 install:
diff --git a/rpm/netavark.spec b/rpm/netavark.spec
index 133f512..2bb33e4 100644
--- a/rpm/netavark.spec
+++ b/rpm/netavark.spec
@@ -99,7 +99,7 @@ EOF
 %{__make} CARGO="%{__cargo}" build
 
 cd docs
-go-md2man -in %{name}.1.md -out %{name}.1
+%{__make}
 
 %install
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install