diff --git a/man/rules/meson.build b/man/rules/meson.build
index f74dbf9c774..7385658d6a4 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -569,6 +569,13 @@ manpages = [
['systemd-machine-id-commit.service', '8', [], ''],
['systemd-machine-id-setup', '1', [], ''],
['systemd-machined.service', '8', ['systemd-machined'], 'ENABLE_MACHINED'],
+ ['systemd-makefs@.service',
+ '8',
+ ['systemd-growfs',
+ 'systemd-growfs@.service',
+ 'systemd-makefs',
+ 'systemd-makeswap@.service'],
+ ''],
['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'],
['systemd-mount', '1', ['systemd-umount'], ''],
['systemd-networkd-wait-online.service',
diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml
new file mode 100644
index 00000000000..073c52fafe4
--- /dev/null
+++ b/man/systemd-makefs@.service.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+ systemd-makefs@.service
+ systemd
+
+
+
+ Developer
+ Zbigniew
+ Jędrzejewski-Szmek
+ zbyszek@in.waw.pl
+
+
+
+
+
+ systemd-makefs@.service
+ 8
+
+
+
+ systemd-makefs@.service
+ systemd-makeswap@.service
+ systemd-growfs@.service
+ systemd-makefs
+ systemd-growfs
+ Creating and growing file systems on demand
+
+
+
+ systemd-makefs@device.service
+ systemd-makeswap@device.service
+ systemd-growfs@mountpoint.service
+ /usr/lib/systemd/systemd-makefs
+ /usr/lib/systemd/systemd-growfs
+
+
+
+ Description
+
+ systemd-makefs@.service,
+ systemd-makeswap@.service, and
+ systemd-growfs@.service are used to implement the
+ and options
+ in fstab5,
+ see systemd.mount5.
+ They are instantiated for each device for which the file system or swap structure
+ needs to be initalized, and for each mount point where the file system needs to
+ be grown.
+
+ These services are started at boot, either right before or right after the
+ mount point or swap device are used.
+
+ systemd-makefs knows very little about specific file
+ systems and swap devices, and after checking that the block device does not already
+ contain a file system or other content, it will execute binaries specific to
+ each filesystem type (/sbin/mkfs.*).
+
+ systemd-growfs knows very little about specific file
+ systems and swap devices, and will instruct the kernel to grow the mounted
+ filesystem to full size of the underlying block device. Nevertheless, it needs
+ to know the
+ ioctl2
+ number specific to each file system, so only certain types are supported.
+ Currently:
+ ext45,
+ btrfs (see
+ btrfs-man55),
+
+ and dm-crypt partitions (see
+ cryptsetup8).
+
+
+ If the creation of a file system or swap device fails, the mount point or
+ swap is failed too. If the growing of a file system fails, a warning is emitted.
+
+
+
+
+ See Also
+
+ systemd1,
+ systemd.mount8,
+ systemd-fstab-generator8,
+ mkfs.btrfs8,
+ mkfs.cramfs8,
+ mkfs.ext48,
+ mkfs.fat8,
+ mkfs.hfsplus8,
+ mkfs.minix8,
+ mkfs.ntfs8,
+ mkfs.xfs8
+
+
+
+
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index bfe52cda0f5..663e7fa3ac6 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -318,6 +318,44 @@
+
+
+
+ The file system or swap structure will be intialized
+ on the device. If the device is not "empty", i.e. it contains any signature,
+ the operation will be skipped. It is hence expected that this option
+ remains set even after the device has been initalized.
+
+ Note that this option can only be used in
+ /etc/fstab, and will be ignored when part of the
+ Options= setting in a unit file.
+
+ See
+ systemd-makefs@.service8.
+
+
+ wipefs8
+ may be used to remove any signatures from a block device to force
+ to reinitialize the device.
+
+
+
+
+
+
+ The file system will be grown to occupy the full block
+ device. If the file system is already at maximum size, no action will
+ be performed. It is hence expected that this option remains set even after
+ the file system has been grown. Only certain file system types are supported,
+ see
+ systemd-makefs@.service8
+ for details.
+
+ Note that this option can only be used in
+ /etc/fstab, and will be ignored when part of the
+ Options= setting in a unit file.
+
+