diff --git a/systemd.changes b/systemd.changes
index 6d4b7de1..940d335c 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr  8 15:45:46 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- systemd.spec: preparation for the next version of systemd (i.e. v256), libkmod
+  will be dlopened hence explicitly require it now as it doesn't hurt with the
+  current version. However don't recommend it from systemd by assuming that when
+  module loading from PID1 is needed, udev is installed.
+
+- Make systemd-doc subpackage noarch.
+
 -------------------------------------------------------------------
 Wed Apr  3 07:03:59 UTC 2024 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 6798adfb..ff47c0c1 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -328,7 +328,10 @@ Requires:       %{name} = %{version}-%{release}
 %systemd_requires
 Requires:       filesystem
 %if %{without bootstrap}
+# kmod executable is needed by kmod-static-nodes.service
 Requires:       kmod
+# By v256 libkmod will be dlopen()ed.
+Requires:       libkmod
 %endif
 Requires:       system-group-hardware
 Requires:       group(kvm)
@@ -729,6 +732,7 @@ Have fun (at your own risk).
 %package doc
 Summary:        Additional documentation or doc formats for systemd
 License:        LGPL-2.1-or-later
+BuildArch:      noarch
 
 %description doc
 A HTML version of the systemd documentation, plus the manual pages