diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 2db2555e29f5..18ecc8442a4b 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1570 2018/01/10 11:08:55 knakahara Exp $
+# $NetBSD: mi,v 1.1571 2018/01/22 09:45:32 kamil Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2726,6 +2726,7 @@
 ./usr/share/man/cat8/mount.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/mount_9p.0			man-puffs-catman	.cat
 ./usr/share/man/cat8/mount_ados.0		man-adosfs-catman	.cat
+./usr/share/man/cat8/mount_autofs.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/mount_cd9660.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/mount_chfs.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/mount_efs.0		man-efs-catman		.cat
@@ -5655,6 +5656,7 @@
 ./usr/share/man/html8/mount.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/mount_9p.html		man-puffs-htmlman	html
 ./usr/share/man/html8/mount_ados.html		man-adosfs-htmlman	html
+./usr/share/man/html8/mount_autofs.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/mount_cd9660.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/mount_chfs.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/mount_efs.html		man-efs-htmlman		html
@@ -8764,6 +8766,7 @@
 ./usr/share/man/man8/mount.8			man-sysutil-man		.man
 ./usr/share/man/man8/mount_9p.8			man-puffs-man		.man
 ./usr/share/man/man8/mount_ados.8		man-adosfs-man		.man
+./usr/share/man/man8/mount_autofs.8		man-sysutil-man		.man
 ./usr/share/man/man8/mount_cd9660.8		man-sysutil-man		.man
 ./usr/share/man/man8/mount_chfs.8		man-sysutil-man		.man
 ./usr/share/man/man8/mount_efs.8		man-efs-man		.man
diff --git a/sbin/mount_autofs/Makefile b/sbin/mount_autofs/Makefile
index 260569582058..cad1aec42d12 100644
--- a/sbin/mount_autofs/Makefile
+++ b/sbin/mount_autofs/Makefile
@@ -1,12 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2018/01/14 22:44:04 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2018/01/22 09:45:32 kamil Exp $
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 
-NOMAN=
 .include <bsd.own.mk>
 
 PROG=	mount_autofs
 SRCS=	mount_autofs.c
-#MAN=	mount_autofs.8
+MAN=	mount_autofs.8
 
 DPADD+=${LIBUTIL}
 LDADD+=-lutil
diff --git a/sbin/mount_autofs/mount_autofs.8 b/sbin/mount_autofs/mount_autofs.8
new file mode 100644
index 000000000000..94e48c4ff63d
--- /dev/null
+++ b/sbin/mount_autofs/mount_autofs.8
@@ -0,0 +1,62 @@
+.\" Copyright (c) 2018 The DragonFly Project
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd January 15, 2018
+.Dt MOUNT_AUTOFS 8
+.Os
+.Sh NAME
+.Nm mount_autofs
+.Nd mount autofs
+.Sh SYNOPSIS
+.Nm
+.Op Fl f Ar from
+.Op Fl o Ar options
+.Op Fl O Ar master_options
+.Op Fl p Ar master_prefix
+.Ar autofs
+.Ar mount_point
+.Sh DESCRIPTION
+The
+.Nm
+command is ported from
+.Nx .
+.Sh SEE ALSO
+.Xr autofs 5 ,
+.Xr fstab 5 ,
+.Xr automount 8 ,
+.Xr mount 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Nx 9.0 .
+The
+.Nm
+utility first appeared in
+.Dx 5.1 .
+.Pp
+This manpage first appeared in
+.Dx
+and has been ported to
+.Nx .
diff --git a/share/man/man5/autofs.5 b/share/man/man5/autofs.5
index 2f9510031e72..10df083ec26a 100644
--- a/share/man/man5/autofs.5
+++ b/share/man/man5/autofs.5
@@ -1,4 +1,4 @@
-.\" $NetBSD: autofs.5,v 1.3 2018/01/14 03:17:28 uwe Exp $
+.\" $NetBSD: autofs.5,v 1.4 2018/01/22 09:45:32 kamil Exp $
 .\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" Copyright (c) 2016 The DragonFly Project
@@ -92,7 +92,8 @@ filesystems specified in
 .Xr auto_master 5 ,
 .Xr automount 8 ,
 .Xr automountd 8 ,
-.Xr autounmountd 8
+.Xr autounmountd 8 ,
+.Xr mount_autofs 8
 .Sh HISTORY
 The
 .Nm