diff --git a/9999-fix-pregen-doc.patch b/9999-fix-pregen-doc.patch
deleted file mode 100644
index 1418eb9..0000000
--- a/9999-fix-pregen-doc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9d61f1890d01c53d35203c49a5a06349320e242a Mon Sep 17 00:00:00 2001
-From: Ana Cabral <acabral@redhat.com>
-Date: Fri, 24 Sep 2021 18:47:51 +0200
-Subject: [PATCH] patch documentation with the proper default values
-
-We don't regenerate the documentation for RHEL builds, but
-the docs from the tarball are generated with a certain set
-of defaults.
-
-Patch the man pages with the proper values.
----
- docs/api/html/NetworkManager.conf.html | 2 +-
- man/NetworkManager.conf.5              | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
-index e8efb5e7fe7d..f432f6736691 100644
---- a/docs/api/html/NetworkManager.conf.html
-+++ b/docs/api/html/NetworkManager.conf.html
-@@ -658,7 +658,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
-           are "<code class="literal">syslog</code>" and "<code class="literal">journal</code>".
-           When NetworkManager is started with "<code class="literal">--debug</code>"
-           in addition all messages will be printed to stderr.
--          If unspecified, the default is "<code class="literal">syslog</code>".
-+          If unspecified, the default is "<code class="literal">journal</code>".
-           </p></td>
- </tr>
- <tr>
-diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
-index 75215918a9d5..2251c95a11b5 100644
---- a/man/NetworkManager.conf.5
-+++ b/man/NetworkManager.conf.5
-@@ -664,7 +664,7 @@ INFO\&.
- .PP
- \fIbackend\fR
- .RS 4
--The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "syslog"\&.
-+The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "journal"\&.
- .RE
- .PP
- \fIaudit\fR
--- 
-2.31.1
-
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 05c0c92..d6d42cb 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@
 %global epoch_version 1
 %global rpm_version 1.36.0
 %global real_version 1.35.4
-%global release_version 0.4
+%global release_version 0.5
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -60,8 +60,7 @@
 %bcond_without ppp
 %bcond_without nmtui
 %bcond_without nm_cloud_setup
-# on RHEL we don't regenerate the documentation
-%bcond_with    regen_docs
+%bcond_without regen_docs
 %if %{bcond_default_debug}
 %bcond_without debug
 %else
@@ -194,12 +193,6 @@ Source6: 70-nm-connectivity.conf
 # Bugfixes that are only relevant until next rebase of the package.
 # Patch1001: 1001-some.patch
 
-# The pregenerated docs contain default values and paths that depend
-# on the configure options when creating the source tarball.
-# As last step, patch the documentation with the proper defaults
-# for RHEL.
-Patch9999: 9999-fix-pregen-doc.patch
-
 Requires(post): systemd
 %if 0%{?fedora} || 0%{?rhel} > 7
 Requires(post): systemd-udev
@@ -1168,6 +1161,9 @@ fi
 
 
 %changelog
+* Thu Jan 20 2022 Thomas Haller <thaller@redhat.com> - 1:1.36.0-0.5
+- generate docs during build instead of using pre-generated (rh #2042875)
+
 * Wed Jan 12 2022 Wen Liang <wenliang@redhat.com> - 1:1.36.0-0.4
 - Upgrade to 1.35.4 release (development)
 - core: don't reset assume state if the device is unmanaged by parent (rh #2012182)