Index: src/pkgdefs/SUNWcsr/prototype_com
===================================================================
--- src/pkgdefs/SUNWcsr/prototype_com	(revision 315)
+++ src/pkgdefs/SUNWcsr/prototype_com	(working copy)
@@ -216,6 +216,7 @@
 d none etc/opt 755 root sys
 e passwd etc/passwd 644 root sys
 e etcprofile etc/profile 644 root sys
+e renameold etc/ksh.kshrc 644 root sys
 e preserve etc/project 644 root sys
 s none etc/protocols=./inet/protocols
 s none etc/prtconf=../usr/sbin/prtconf
Index: src/cmd/ksh/Makefile.com
===================================================================
--- src/cmd/ksh/Makefile.com	(revision 315)
+++ src/cmd/ksh/Makefile.com	(working copy)
@@ -74,6 +74,7 @@
 	-DSHOPT_RAWONLY \
 	-DSHOPT_SUID_EXEC \
 	-DSHOPT_VSH \
+	-DSHOPT_SYSRC \
         -D_BLD_shell \
 	-D_PACKAGE_ast \
 	'-DUSAGE_LICENSE="[-author?David Korn <dgk@research.att.com>][-copyright?Copyright (c) 1982-2006 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libshell]"'
Index: src/cmd/nsadmin/profile
===================================================================
--- src/cmd/nsadmin/profile	(revision 315)
+++ src/cmd/nsadmin/profile	(working copy)
@@ -41,7 +41,7 @@
 #	-rsh is given its environment in its .profile.
 
 case "$0" in
--sh | -ksh | -jsh | -bash)
+-sh | -ksh | -ksh93 | -jsh | -bash)
 
 	if [ ! -f .hushlogin ]
 	then
Index: src/cmd/nsadmin/Makefile
===================================================================
--- src/cmd/nsadmin/Makefile	(revision 315)
+++ src/cmd/nsadmin/Makefile	(working copy)
@@ -22,10 +22,10 @@
 #
 #ident	"@(#)Makefile	1.9	05/06/08 SMI"
 #
-# Copyright (c) 1989, 2001 by Sun Microsystems, Inc.
+# Copyright (c) 1989, 2001, 2006 by Sun Microsystems, Inc.
 # All rights reserved.
 
-PROG= profile .login system
+PROG= profile .login ksh.kshrc system
 PROGSKEL= local.login local.profile local.cshrc
 
 include ../Makefile.cmd
Index: src/cmd/nsadmin/ksh.kshrc
===================================================================
--- src/cmd/nsadmin/ksh.kshrc	(revision 0)
+++ src/cmd/nsadmin/ksh.kshrc	(revision 0)
@@ -0,0 +1,29 @@
+#
+# 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	"@(#)ksh.kshrc	1.1	06/06/10 SMI"
+#
+# This file is sourced by interactive ksh93 shells before ${HOME}/.kshrc
+
+# enable gmacs editor mode by default for ksh93
+set -o gmacs
+
+#EOF.
Index: src/lib/libshell/Makefile.com
===================================================================
--- src/lib/libshell/Makefile.com	(revision 315)
+++ src/lib/libshell/Makefile.com	(working copy)
@@ -152,6 +152,7 @@
 	-DSHOPT_RAWONLY \
 	-DSHOPT_SUID_EXEC \
 	-DSHOPT_VSH \
+	-DSHOPT_SYSRC \
         -D_BLD_shell \
 	-D_PACKAGE_ast \
 	'-DUSAGE_LICENSE="[-author?David Korn <dgk@research.att.com>][-copyright?Copyright (c) 1982-2006 AT&T Knowledge Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libshell]"'