diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index f208f8deb4..ee2d5c2486 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -250,20 +250,19 @@
-
-
+ [BOOL]
- Compress or not, respectively, the data in the
- journal using XZ.
+ If this is set to yes then compress
+ the data in the journal using XZ. The default is yes.
+
-
-
+ [BOOL]
- Periodically sign or not, respectively, the
- data in the journal using Forward Secure Sealing.
-
+ If this is set to yes then
+ periodically sign the data in the journal using Forward Secure Sealing.
+ The default is no.
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index a9009cfefe..d86c3681b1 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -127,6 +127,10 @@ static int spawn_child(const char* child, char** argv) {
if (r < 0)
log_warning_errno(errno, "Failed to close write end of pipe: %m");
+ r = fd_nonblock(fd[0], true);
+ if (r < 0)
+ log_warning_errno(errno, "Failed to set child pipe to non-blocking: %m");
+
return fd[0];
}