diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index db5e4efd5b2..42ecabc8074 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -86,7 +86,7 @@
       <varlistentry>
         <term><varname>ServerCertificateFile=</varname></term>
 
-        <listitem><para>SSL CA certificate in PEM format.</para></listitem>
+        <listitem><para>SSL certificate in PEM format.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -102,7 +102,7 @@
   <refsect1>
       <title>See Also</title>
       <para>
-        <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-journal-remote.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
       </para>
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index 8e241370db0..9d486d9801c 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -96,7 +96,7 @@
   <refsect1>
       <title>See Also</title>
       <para>
-        <citerefentry><refentrytitle>systemd-journal-upload</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
       </para>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 1bec2b79fb5..12d6a80c573 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -976,8 +976,8 @@ journalctl _SYSTEMD_CGROUP=/user.slice/user-42.slice/session-c1.scope</programli
       <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journal-upload</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>systemd-journal-remote.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     </para>
   </refsect1>
 </refentry>
diff --git a/man/rules/meson.build b/man/rules/meson.build
index 6b07cfc4feb..e9759f16a15 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -574,8 +574,14 @@ manpages = [
   '8',
   ['systemd-journal-gatewayd', 'systemd-journal-gatewayd.socket'],
   'HAVE_MICROHTTPD'],
- ['systemd-journal-remote', '8', [], 'HAVE_MICROHTTPD'],
- ['systemd-journal-upload', '8', [], 'HAVE_MICROHTTPD'],
+ ['systemd-journal-remote.service',
+  '8',
+  ['systemd-journal-remote', 'systemd-journal-remote.socket'],
+  'HAVE_MICROHTTPD'],
+ ['systemd-journal-upload.service',
+  '8',
+  ['systemd-journal-upload'],
+  'HAVE_MICROHTTPD'],
  ['systemd-journald.service',
   '8',
   ['systemd-journald',
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.service.xml
similarity index 94%
rename from man/systemd-journal-remote.xml
rename to man/systemd-journal-remote.service.xml
index 17014953579..acaf61c39f1 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.service.xml
@@ -17,7 +17,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
-    <title>systemd-journal-remote</title>
+    <title>systemd-journal-remote.service</title>
     <productname>systemd</productname>
 
     <authorgroup>
@@ -31,18 +31,22 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-journal-remote</refentrytitle>
+    <refentrytitle>systemd-journal-remote.service</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
+    <refname>systemd-journal-remote.service</refname>
+    <refname>systemd-journal-remote.socket</refname>
     <refname>systemd-journal-remote</refname>
     <refpurpose>Receive journal messages over the network</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
+    <para><filename>systemd-journal-remote.service</filename></para>
+    <para><filename>systemd-journal-remote.socket</filename></para>
     <cmdsynopsis>
-      <command>systemd-journal-remote</command>
+      <command>/usr/lib/systemd/systemd-journal-remote</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="norepeat">-o/--output=<replaceable>DIR</replaceable>|<replaceable>FILE</replaceable></arg>
       <arg choice="opt" rep="repeat">SOURCES</arg>
@@ -159,8 +163,8 @@
         interpreted as the (negated) file descriptor number, or an
         address suitable for <option>ListenStream=</option> (c.f.
         <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
-        In the first case, matching file descriptor must be inherited
-        through
+        In the first case, the server listens on port 19532 by default,
+        and the matching file descriptor must be inherited through
         <varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>.
         In the second case, an HTTP or HTTPS server will be spawned on
         this port, respectively for <option>--listen-http=</option> and
@@ -351,11 +355,11 @@ systemd-journal-remote --url http://some.host:19531/entries?boot&amp;follow
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>systemd-journal-upload</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>journal-remote.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journal-gatewayd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      <citerefentry><refentrytitle>journal-remote.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>systemd-journal-gatewayd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     </para>
   </refsect1>
 </refentry>
diff --git a/man/systemd-journal-upload.xml b/man/systemd-journal-upload.service.xml
similarity index 93%
rename from man/systemd-journal-upload.xml
rename to man/systemd-journal-upload.service.xml
index 900706a34d6..141e595400d 100644
--- a/man/systemd-journal-upload.xml
+++ b/man/systemd-journal-upload.service.xml
@@ -17,7 +17,7 @@
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
-    <title>systemd-journal-upload</title>
+    <title>systemd-journal-upload.service</title>
     <productname>systemd</productname>
 
     <authorgroup>
@@ -31,18 +31,20 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-journal-upload</refentrytitle>
+    <refentrytitle>systemd-journal-upload.service</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
+    <refname>systemd-journal-upload.service</refname>
     <refname>systemd-journal-upload</refname>
     <refpurpose>Send journal messages over the network</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
+    <para><filename>systemd-journal-upload.service</filename></para>
     <cmdsynopsis>
-      <command>systemd-journal-upload</command>
+      <command>/usr/lib/systemd/systemd-journal-upload</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="norepeat">-u/--url=<replaceable>URL</replaceable></arg>
       <arg choice="opt" rep="repeat">SOURCES</arg>
@@ -67,13 +69,15 @@
     <variablelist>
       <varlistentry>
         <term><option>-u</option></term>
-        <term><option>--url=<optional>https://</optional><replaceable>URL</replaceable></option></term>
-        <term><option>--url=<optional>http://</optional><replaceable>URL</replaceable></option></term>
+        <term><option>--url=<optional>https://</optional><replaceable>URL</replaceable>[:<replaceable>PORT</replaceable>]</option></term>
+        <term><option>--url=<optional>http://</optional><replaceable>URL</replaceable>[:<replaceable>PORT</replaceable>]</option></term>
 
         <listitem><para>Upload to the specified
         address. <replaceable>URL</replaceable> may specify either
         just the hostname or both the protocol and
         hostname. <constant>https</constant> is the default.
+        The port number may be specified after a colon (<literal>:</literal>),
+        otherwise <constant>19532</constant> will be used by default.
         </para></listitem>
       </varlistentry>
 
@@ -281,7 +285,7 @@ openssl ca -batch -config ca.conf -notext -in $CLIENT.csr -out $CLIENT.pem
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-journal-remote.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-journal-gatewayd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>