--- a/share/man/man8/automount.8	Mon Jul 16 19:59:44 2018 +0300
+++ b/share/man/man8/automount.8	Mon Jul 16 20:39:06 2018 +0300
@@ -19,7 +19,7 @@
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\"
-.Dd February 25, 2017
+.Dd July 16, 2018
 .Dt AUTOMOUNT 8
 .Os
 .Sh NAME
@@ -61,26 +61,9 @@
 .Pa /etc/auto_master
 determines the locations of all
 .Nm autofs
-mount points. By default, this file contains three entries:
-.Bd -literal -offset indent
-# Master map for automounter
-#
-+auto_master
-/net	-hosts -nosuid
-/home	auto_home
-.Ed
+mount points.
 .Pp
 The
-.Sy +auto_master
-entry is a reference to an external NIS master map. If one exists, then
-its entries are read as if they occurred in place of the
-.Sy +auto_master
-entry. The remaining entries in the master file specify a directory on which an
-.Nm autofs
-mount will be made followed by the automounter map to be associated with it.
-Optional mount options may be supplied as an optional third field in the each
-entry. These options are used for any entries in the map that do not specify
-mount options explicitly. The
 .Nm
 command is usually run without arguments. It compares the entries
 .Pa /etc/auto_master

--- a/usr/src/cmd/fs.d/autofs/Makefile	Mon Jul 16 19:59:44 2018 +0300
+++ b/usr/src/cmd/fs.d/autofs/Makefile	Mon Jul 16 20:39:06 2018 +0300
@@ -36,8 +36,6 @@
 
 LINKINSTALL=	$(ROOTUSRSBIN)/$(AUTO)
 LINKVALUE=	../lib/fs/$(FSTYPE)/$(AUTO)
-MAPS=		auto_master auto_home
-MAPINSTALL=	$(MAPS:%=$(ROOTETC)/%)
 AUTOFS=		autofs
 DEFAULTFILES=	autofs.dfl
 SMFMANIFEST=	autofs.xml
@@ -45,7 +43,7 @@
 MFSTINSTALL=	$(SMFMANIFEST:%=$(ROOTSVCSYSTEM)/filesystem/%)
 METHODINSTALL=	$(SMFMETHOD:%=$(ROOTLIBSVCMETHOD)/%)
 
-OTHERINSTALL=	$(MAPINSTALL) $(LINKINSTALL) $(ROOTETCDEFAULTFILES) \
+OTHERINSTALL=	$(LINKINSTALL) $(ROOTETCDEFAULTFILES) \
 		$(MFSTINSTALL) $(METHODINSTALL)
 
 UNCHECKED_HDRS=	webnfs.h
@@ -55,8 +53,6 @@
 
 include		../Makefile.fstype
 
-$(MAPINSTALL)	:= FILEMODE= 0644
-
 $(MFSTINSTALL)	:= FILEMODE = 0444
 
 REAL_COMMON=	debug_alloc.o

--- a/usr/src/cmd/fs.d/autofs/auto_home	Mon Jul 16 19:59:44 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Home directory map for automounter
-#
-+auto_home

--- a/usr/src/cmd/fs.d/autofs/auto_master	Mon Jul 16 19:59:44 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Master map for automounter
-#
-+auto_master
-/net		-hosts		-nosuid,nobrowse
-/home		auto_home	-nobrowse

--- a/usr/src/cmd/fs.d/autofs/autofs.xml	Mon Jul 16 19:59:44 2018 +0300
+++ b/usr/src/cmd/fs.d/autofs/autofs.xml	Mon Jul 16 20:39:06 2018 +0300
@@ -37,7 +37,7 @@
 <service
 	name='system/filesystem/autofs'
 	type='service'
-	version='1'>
+	version='2'>
 
 	<dependency
 		name='fs'
@@ -101,7 +101,7 @@
 
 	<property_group name='application' type='framework'>
 		<stability value='Evolving' />
-		<propval name='auto_enable' type='boolean' value='true' />
+		<propval name='auto_enable' type='boolean' value='false' />
 	</property_group>
 
 	<instance name='default' enabled='false'>

--- a/usr/src/pkg/manifests/system-file-system-autofs.mf	Mon Jul 16 19:59:44 2018 +0300
+++ b/usr/src/pkg/manifests/system-file-system-autofs.mf	Mon Jul 16 20:39:06 2018 +0300
@@ -48,8 +48,6 @@
 dir path=usr/share/man
 dir path=usr/share/man/man8
 dir path=usr/share/man/man4
-file path=etc/auto_home preserve=true
-file path=etc/auto_master preserve=true
 file path=etc/default/autofs group=sys preserve=renameold
 file path=lib/svc/manifest/system/filesystem/autofs.xml group=sys mode=0444
 file path=lib/svc/method/svc-autofs mode=0555