--- old/usr/src/cmd/Makefile	2014-05-03 17:21:29.825607986 +0100
+++ new/usr/src/cmd/Makefile	2014-05-03 17:21:29.835791660 +0100
@@ -24,6 +24,7 @@
 # Copyright (c) 2012 Joyent, Inc.  All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright (c) 2013 DEY Storage Systems, Inc. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 
 include ../Makefile.master
 
@@ -364,7 +365,6 @@
 	sed		\
 	sendmail	\
 	setfacl		\
-	setmnt		\
 	setpgrp		\
 	setuname	\
 	sgs		\
--- old/usr/src/cmd/setmnt/Makefile	2014-05-03 17:21:30.030085671 +0100
+++ /dev/null	2014-05-03 17:21:30.000000000 +0100
@@ -1,48 +0,0 @@
-#
-# 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
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-SHFILES=	setmnt
-ALL=		$(SHFILES)
-CLOBBERFILES=	$(ALL)
-PROG=		setmnt
-
-include ../Makefile.cmd
-
-.KEEP_STATE:
-
-all: $(PROG) 
-
-install: all  $(ROOTUSRSBINPROG)
-	-$(RM) $(ROOTETCPROG)
-	-$(SYMLINK) ../usr/sbin/$(PROG) $(ROOTETCPROG)
-
-clean:
-
-lint:
-
-include ../Makefile.targ
--- old/usr/src/cmd/setmnt/setmnt.sh	2014-05-03 17:21:30.099559219 +0100
+++ /dev/null	2014-05-03 17:21:30.000000000 +0100
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# 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
-#
-
-#
-#	Copyright (c) 1999, Sun Microsystems Inc.
-#
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-echo "setmnt: Error: deprecated utility" >&2
-exit 1
--- old/usr/src/pkg/manifests/SUNWcs.mf	2014-05-03 17:21:30.172042334 +0100
+++ new/usr/src/pkg/manifests/SUNWcs.mf	2014-05-03 17:21:30.178415339 +0100
@@ -23,6 +23,7 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright (c) 2013 Gary Mills
+# Copyright 2014 Andrew Stormont.
 #
 
 <include SUNWcs.man1.inc>
@@ -1388,7 +1389,6 @@
 file path=usr/sbin/rpcbind mode=0555
 $(i386_ONLY)file path=usr/sbin/rtc mode=0555
 file path=usr/sbin/sacadm group=sys mode=4755
-file path=usr/sbin/setmnt mode=0555
 file path=usr/sbin/shareall mode=0555
 file path=usr/sbin/sharectl mode=0555
 file path=usr/sbin/sharemgr mode=0555
@@ -1768,7 +1768,6 @@
 link path=etc/reboot target=../usr/sbin/halt
 link path=etc/security/audit/localhost/files target=../../../../var/audit
 link path=etc/services target=./inet/services
-link path=etc/setmnt target=../usr/sbin/setmnt
 link path=etc/shutdown target=../usr/sbin/shutdown
 link path=etc/sulogin target=../sbin/sulogin
 link path=etc/swap target=../usr/sbin/swap
