diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rpm
 PORTVERSION=	4.18.1
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/
 PKGNAMESUFFIX=	4
@@ -12,8 +13,7 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
-		${LOCALBASE}/lib/libelf.so:devel/elfutils \
-		pandoc:textproc/hs-pandoc
+		${LOCALBASE}/lib/libelf.so:devel/elfutils
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libnss3.so:security/nss \
 		libzstd.so:archivers/zstd \
@@ -38,7 +38,9 @@
 		--sysconfdir=${PREFIX}/etc \
 		--localstatedir=/var \
 		--without-javaglue \
-		am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER}
+		am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER} \
+		ac_cv_path_DOXYGEN=no \
+		ac_cv_prog_HAVE_DOT=no
 CONFIGURE_ENV=	LUA_CFLAGS=-I${LUA_INCDIR} \
 		LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm"
 INSTALL_TARGET=	install-strip
@@ -58,9 +60,13 @@
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	PYTHON PLUGINS NLS DOCS
-OPTIONS_DEFAULT=PYTHON
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		DOCS MANPAGES NLS PLUGINS PYTHON
+OPTIONS_DEFAULT=	PYTHON
+OPTIONS_SUB=		yes
+
+MANPAGES_DESC=		Rebuild manual pages (otherwise install prebuilded)
+MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
+MANPAGES_CONFIGURE_OFF=	ac_cv_path_PANDOC=no
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
@@ -68,6 +74,7 @@
 
 PLUGINS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 PLUGINS_CONFIGURE_ENABLE=plugins
+
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENABLE=python
 
diff --git a/archivers/rpm4/files/patch-docs_Makefile.am b/archivers/rpm4/files/patch-docs_Makefile.am
new file mode 100644
--- /dev/null
+++ b/archivers/rpm4/files/patch-docs_Makefile.am
@@ -0,0 +1,13 @@
+--- docs/Makefile.am.orig	2023-03-13 14:33:50 UTC
++++ docs/Makefile.am
+@@ -1,8 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-if PANDOC
++#if PANDOC
+ SUBDIRS = man
+-endif
++#endif
+ 
+ EXTRA_DIST =
+ 
diff --git a/archivers/rpm4/files/patch-docs_Makefile.in b/archivers/rpm4/files/patch-docs_Makefile.in
new file mode 100644
--- /dev/null
+++ b/archivers/rpm4/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	2023-07-21 09:25:20 UTC
++++ docs/Makefile.in
+@@ -442,7 +442,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-@PANDOC_TRUE@SUBDIRS = man
++SUBDIRS = man
+ EXTRA_DIST = _layouts/default.html _layouts/favicon.ico index.md \
+ 	manual/index.md manual/arch_dependencies.md \
+ 	manual/autosetup.md manual/boolean_dependencies.md \
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -64,7 +64,7 @@
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
-%%PYTHON_SITELIBDIR%%/rpm-%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm-%%VERSION%%-py%%PYTHON_VER%%.egg-info
 %%PLUGINS%%lib/rpm-plugins/dbus_announce.so
 %%PLUGINS%%lib/rpm-plugins/prioreset.so
 %%PLUGINS%%lib/rpm-plugins/syslog.so