diff --git a/files.journal-remote b/files.journal-remote
new file mode 100644
index 00000000..9db81f68
--- /dev/null
+++ b/files.journal-remote
@@ -0,0 +1,29 @@
+#
+# Please keep the list sorted (with `LC_ALL=C sort`).
+#
+%config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf
+%config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf
+%ghost %dir %{_localstatedir}/log/journal/remote
+%{_datadir}/systemd/gatewayd
+%{_datadir}/systemd/gatewayd/browse.html
+%{_mandir}/man5/journal-remote.conf.5.gz
+%{_mandir}/man5/journal-remote.conf.d.5.gz
+%{_mandir}/man5/journal-upload.conf.5.gz
+%{_mandir}/man5/journal-upload.conf.d.5.gz
+%{_mandir}/man8/systemd-journal-gatewayd.8.gz
+%{_mandir}/man8/systemd-journal-gatewayd.service.8.gz
+%{_mandir}/man8/systemd-journal-gatewayd.socket.8.gz
+%{_mandir}/man8/systemd-journal-remote.8.gz
+%{_mandir}/man8/systemd-journal-remote.service.8.gz
+%{_mandir}/man8/systemd-journal-remote.socket.8.gz
+%{_mandir}/man8/systemd-journal-upload.8.gz
+%{_mandir}/man8/systemd-journal-upload.service.8.gz
+%{_systemd_util_dir}/systemd-journal-gatewayd
+%{_systemd_util_dir}/systemd-journal-remote
+%{_systemd_util_dir}/systemd-journal-upload
+%{_sysusersdir}/systemd-remote.conf
+%{_unitdir}/systemd-journal-gatewayd.service
+%{_unitdir}/systemd-journal-gatewayd.socket
+%{_unitdir}/systemd-journal-remote.service
+%{_unitdir}/systemd-journal-remote.socket
+%{_unitdir}/systemd-journal-upload.service
diff --git a/files.portable b/files.portable
new file mode 100644
index 00000000..d96d9161
--- /dev/null
+++ b/files.portable
@@ -0,0 +1,15 @@
+#
+# Please keep the list sorted (with `LC_ALL=C sort`).
+#
+%{_bindir}/portablectl
+%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
+%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
+%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
+%{_mandir}/man1/portablectl.1.gz
+%{_mandir}/man8/systemd-portabled.8.gz
+%{_mandir}/man8/systemd-portabled.service.8.gz
+%{_systemd_util_dir}/portable
+%{_systemd_util_dir}/systemd-portabled
+%{_tmpfilesdir}/portables.conf
+%{_unitdir}/dbus-org.freedesktop.portable1.service
+%{_unitdir}/systemd-portabled.service
diff --git a/systemd.changes b/systemd.changes
index 74504ff5..fe09321b 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 19 12:13:51 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- systemd.spec: add files.portable and files.journal-remote
+
 -------------------------------------------------------------------
 Wed Oct 18 08:10:01 UTC 2023 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 569fb095..6a9ccece 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -183,6 +183,8 @@ Source207:      files.experimental
 Source208:      files.coredump
 Source209:      files.homed
 Source210:      files.lang
+Source211:      files.journal-remote
+Source212:      files.portable
 
 #
 # All changes backported from upstream are tracked by the git repository, which
@@ -1336,22 +1338,7 @@ fi
 %if %{with journal_remote}
 %files journal-remote
 %defattr(-, root, root)
-%config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf
-%config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf
-%{_unitdir}/systemd-journal-gatewayd.*
-%{_unitdir}/systemd-journal-remote.*
-%{_unitdir}/systemd-journal-upload.*
-%{_systemd_util_dir}/systemd-journal-gatewayd
-%{_systemd_util_dir}/systemd-journal-remote
-%{_systemd_util_dir}/systemd-journal-upload
-%{_sysusersdir}/systemd-remote.conf
-%{_mandir}/man5/journal-remote.conf*
-%{_mandir}/man5/journal-upload.conf*
-%{_mandir}/man8/systemd-journal-gatewayd.*
-%{_mandir}/man8/systemd-journal-remote.*
-%{_mandir}/man8/systemd-journal-upload.*
-%{_datadir}/systemd/gatewayd
-%ghost %dir %{_localstatedir}/log/journal/remote
+%include %{SOURCE211}
 %endif
 
 %if %{with homed}
@@ -1363,17 +1350,7 @@ fi
 %if %{with portabled}
 %files portable
 %defattr(-,root,root)
-%{_bindir}/portablectl
-%{_systemd_util_dir}/systemd-portabled
-%{_systemd_util_dir}/portable
-%{_unitdir}/systemd-portabled.service
-%{_unitdir}/dbus-org.freedesktop.portable1.service
-%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
-%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
-%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
-%{_tmpfilesdir}/portables.conf
-%{_mandir}/man*/portablectl*
-%{_mandir}/man*/systemd-portabled*
+%include %{SOURCE212}
 %endif
 
 %if %{with testsuite}