diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml
index 890c950cd0..3463a107da 100644
--- a/man/systemd-mount.xml
+++ b/man/systemd-mount.xml
@@ -70,9 +70,9 @@
     whose name is generated from the file system label. In this mode the block device or image file must
     exist at the time of invocation of the command, so that it may be probed. If the device is found to be a
     removable block device (e.g. a USB stick), an automount point is created instead of a regular mount point
-    (i.e. the <option>--automount=</option> option is implied, see below). If the option <option>--tmpfs</option>
-    is specified, then the argument will be interpreted as the path where the new temporary file system will
-    be mounted on.</para>
+    (i.e. the <option>--automount=</option> option is implied, see below). If the option
+    <option>--tmpfs</option> is specified, then the argument is interpreted as the path where the new
+    temporary file system shall be mounted.</para>
 
     <para>If two arguments are specified, the first indicates the mount source (the
     <replaceable>WHAT</replaceable>) and the second indicates the path to mount it on (the
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 31abc0685d..a0f1503f70 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -206,7 +206,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "bind-device",        no_argument,       NULL, ARG_BIND_DEVICE        },
                 { "list",               no_argument,       NULL, ARG_LIST               },
                 { "umount",             no_argument,       NULL, 'u'                    },
-                { "unmount",            no_argument,       NULL, 'u'                    },
+                { "unmount",            no_argument,       NULL, 'u'                    }, /* Compat spelling */
                 { "collect",            no_argument,       NULL, 'G'                    },
                 { "tmpfs",              no_argument,       NULL, 'T'                    },
                 {},
@@ -407,7 +407,7 @@ static int parse_argv(int argc, char *argv[]) {
 
                 if (argc > optind+2)
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                               "At most two arguments required.");
+                                               "More than two arguments are not allowed.");
 
                 if (arg_tmpfs) {
                         if (argc <= optind+1) {