diff --git a/systemd.changes b/systemd.changes
index 9b1bd549..65d3231c 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 19 14:25:46 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Move the systemd-network-generator stuff in udev package
+
+  This generator can generate .link files and is mainly used in initrd where
+  udev is mandatory.
+
 -------------------------------------------------------------------
 Tue Jan 18 17:57:43 UTC 2022 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index f4ead050..1dbeb761 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1291,6 +1291,8 @@ fi
 %dir %{_prefix}/lib/systemd/network
 %dir %{_unitdir}
 %{_userunitdir}
+%exclude %{_prefix}/lib/systemd/systemd-network-generator
+%exclude %{_unitdir}/systemd-network-generator.service
 %if %{with coredump}
 %exclude %{_prefix}/lib/systemd/systemd-coredump
 %exclude %{_unitdir}/systemd-coredump*
@@ -1303,6 +1305,7 @@ fi
 %exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd
 %exclude %{_prefix}/lib/systemd/systemd-journal-remote
 %exclude %{_prefix}/lib/systemd/systemd-journal-upload
+%exclude %{_datadir}/systemd/gatewayd
 %endif
 %exclude %{_prefix}/lib/systemd/systemd-udevd
 %exclude %{_unitdir}/systemd-udev*.*
@@ -1331,10 +1334,8 @@ fi
 %exclude %{_unitdir}/dbus-org.freedesktop.import1.service
 %endif
 %if %{with networkd}
-%exclude %{_prefix}/lib/systemd/systemd-network-generator
 %exclude %{_prefix}/lib/systemd/systemd-networkd
 %exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online
-%exclude %{_unitdir}/systemd-network-generator.service
 %exclude %{_unitdir}/systemd-networkd.service
 %exclude %{_unitdir}/systemd-networkd.socket
 %exclude %{_unitdir}/systemd-networkd-wait-online.service
@@ -1476,10 +1477,6 @@ fi
 %{_datadir}/systemd
 %{_datadir}/factory
 
-%if %{with journal_remote}
-%exclude %{_datadir}/systemd/gatewayd
-%endif
-
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
@@ -1504,12 +1501,13 @@ fi
 %{_mandir}/man7/[bdfks]*
 %{_mandir}/man8/kern*
 %{_mandir}/man8/pam_*
-%{_mandir}/man8//rc-local.*
+%{_mandir}/man8/rc-local.*
 %{_mandir}/man8/systemd-[a-gik-tvx]*
 %{_mandir}/man8/systemd-h[aioy]*
 %{_mandir}/man8/systemd-journald*
 %{_mandir}/man8/systemd-u[ps]*
 %{_mandir}/man8/30-systemd-environment-d-generator.*
+%exclude %{_mandir}/man8/systemd-network-generator.*
 %if %{with coredump}
 %exclude %{_mandir}/man1/coredumpctl*
 %exclude %{_mandir}/man5/coredump.conf*
@@ -1640,6 +1638,8 @@ fi
 %{_prefix}/lib/udev/scsi_id
 %{_prefix}/lib/udev/v4l_id
 %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
+%{_prefix}/lib/systemd/systemd-udevd
+%{_prefix}/lib/systemd/systemd-network-generator
 %dir %{_udevrulesdir}/
 %doc %{_udevrulesdir}/README
 %exclude %{_udevrulesdir}/70-uaccess.rules
@@ -1652,16 +1652,7 @@ fi
 %dir %{_sysconfdir}/udev/rules.d/
 %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin
 %config(noreplace) %{_sysconfdir}/udev/udev.conf
-%if ! 0%{?bootstrap}
-%{_mandir}/man5/udev*
-%{_mandir}/man7/hwdb*
-%{_mandir}/man7/udev*
-%{_mandir}/man8/systemd-hwdb*
-%{_mandir}/man8/systemd-udev*
-%{_mandir}/man8/udev*
-%endif
 %dir %{_unitdir}
-%{_prefix}/lib/systemd/systemd-udevd
 %{_unitdir}/kmod-static-nodes.service
 %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service
 %{_tmpfilesdir}/static-nodes-permissions.conf
@@ -1669,6 +1660,7 @@ fi
 %{_unitdir}/systemd-udevd*.socket
 %{_unitdir}/systemd-hwdb*.*
 %{_unitdir}/initrd-udevadm-cleanup-db.service
+%{_unitdir}/systemd-network-generator.service
 %dir %{_unitdir}/sysinit.target.wants
 %{_unitdir}/sysinit.target.wants/systemd-udev*.service
 %dir %{_unitdir}/sockets.target.wants
@@ -1676,6 +1668,15 @@ fi
 %{_unitdir}/*.target.wants/systemd-hwdb*.*
 %{_prefix}/lib/systemd/network/99-default.link
 %{_datadir}/pkgconfig/udev.pc
+%if ! 0%{?bootstrap}
+%{_mandir}/man5/udev*
+%{_mandir}/man7/hwdb*
+%{_mandir}/man7/udev*
+%{_mandir}/man8/systemd-hwdb*
+%{_mandir}/man8/systemd-udev*
+%{_mandir}/man8/udev*
+%{_mandir}/man8/systemd-network-generator.*
+%endif
 
 %files -n libsystemd0%{?mini}
 %defattr(-,root,root)
@@ -1817,10 +1818,8 @@ fi
 %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
 %{_prefix}/lib/systemd/network/*.network
 %{_prefix}/lib/systemd/network/*.network.example
-%{_prefix}/lib/systemd/systemd-network-generator
 %{_prefix}/lib/systemd/systemd-networkd
 %{_prefix}/lib/systemd/systemd-networkd-wait-online
-%{_unitdir}/systemd-network-generator.service
 %{_unitdir}/systemd-networkd.service
 %{_unitdir}/systemd-networkd.socket
 %{_unitdir}/systemd-networkd-wait-online.service