diff --git a/Makefile-man.am b/Makefile-man.am
index ab1db33c01..2f3e5f2271 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1358,14 +1358,20 @@ endif
if HAVE_MICROHTTPD
MANPAGES += \
+ man/journal-remote.conf.5 \
man/systemd-journal-gatewayd.service.8 \
man/systemd-journal-remote.8 \
man/systemd-journal-upload.8
MANPAGES_ALIAS += \
+ man/journal-remote.conf.d.5 \
man/systemd-journal-gatewayd.8 \
man/systemd-journal-gatewayd.socket.8
+man/journal-remote.conf.d.5: man/journal-remote.conf.5
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
+man/journal-remote.conf.d.html: man/journal-remote.conf.html
+ $(html-alias)
+
man/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html
$(html-alias)
@@ -1662,6 +1668,7 @@ EXTRA_DIST += \
man/hostname.xml \
man/hostnamectl.xml \
man/hwdb.xml \
+ man/journal-remote.conf.xml \
man/journalctl.xml \
man/journald.conf.xml \
man/kernel-command-line.xml \
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
new file mode 100644
index 0000000000..a7b2227182
--- /dev/null
+++ b/man/journal-remote.conf.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+ journal-remote.conf
+ systemd
+
+
+
+ Developer
+ Chris
+ Morgan
+ chmorgan@gmail.com
+
+
+
+
+
+ journal-remote.conf
+ 5
+
+
+
+ journal-remote.conf
+ journal-remote.conf.d
+ Journal remote service configuration files
+
+
+
+ /etc/systemd/journal-remote.conf
+ /etc/systemd/journald.conf.d/*.conf
+ /run/systemd/journald.conf.d/*.conf
+ /usr/lib/systemd/journald.conf.d/*.conf
+
+
+
+ Description
+
+ These files configure various parameters of the systemd-remote-journal
+ application,
+ systemd-journal-remote8.
+
+
+
+
+
+ Options
+
+ All options are configured in the
+ [Remote] section:
+
+
+
+
+ SplitMode=
+
+ One of host or none.
+
+
+
+
+ ServerKeyFile=
+
+ SSL key in PEM format
+
+
+
+ ServerCertificateFile=
+
+ SSL CA certificate in PEM format.
+
+
+
+ TrustedCertificateFile=
+
+ SSL CA certificate.
+
+
+
+
+
+
+
+ See Also
+
+ systemd-journal-remote1,
+ systemd1,
+ systemd-journald.service8
+
+
+
+
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index 2687662a14..d5bda635c4 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -310,6 +310,7 @@ systemd-journal-remote --url http://some.host:19531/
journalctl1,
systemd-journald.service8,
systemd-journal-gatewayd.service8
+ journal-remote.conf5