diff --git a/Makefile.am b/Makefile.am
index bc16ce315b..2e982f5067 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1936,7 +1936,8 @@ SYSINIT_TARGET_WANTS += \
 	systemd-sysusers.service
 
 dist_sysusers_DATA = \
-	sysusers.d/systemd.conf
+	sysusers.d/systemd.conf \
+	sysusers.d/systemd-remote.conf
 
 nodist_sysusers_DATA = \
 	sysusers.d/basic.conf
diff --git a/sysusers.d/systemd-remote.conf b/sysusers.d/systemd-remote.conf
new file mode 100644
index 0000000000..c03b862698
--- /dev/null
+++ b/sysusers.d/systemd-remote.conf
@@ -0,0 +1,10 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+u systemd-journal-gateway       -               "systemd Journal Gateway"
+u systemd-journal-remote        -               "systemd Journal Remote"
+u systemd-journal-upload        -               "systemd Journal Upload"
diff --git a/sysusers.d/systemd.conf b/sysusers.d/systemd.conf
index 4c4bd4a209..2dd427411f 100644
--- a/sysusers.d/systemd.conf
+++ b/sysusers.d/systemd.conf
@@ -6,8 +6,6 @@
 #  (at your option) any later version.
 
 g systemd-journal               -               -
-u systemd-journal-gateway       -               "systemd Journal Gateway"
-u systemd-journal-remote        -               "systemd Journal Remote"
 u systemd-bus-proxy             -               "systemd Bus Proxy"
 u systemd-network               -               "systemd Network Management"
 u systemd-resolve               -               "systemd Resolver"