--- a/FEATURES.txt	Mon May 20 12:52:22 2019 -0400
+++ b/FEATURES.txt	Mon May 20 14:23:00 2019 -0400
@@ -10,6 +10,7 @@
 <next> release
 --------------
  - /etc/log symlink & /var/adm/log directory
+ - /etc/[uw]tmpx symlink
 
 1.3 release
 -----------

--- a/share/man/man8/saf.8	Mon May 20 12:52:22 2019 -0400
+++ b/share/man/man8/saf.8	Mon May 20 14:23:00 2019 -0400
@@ -755,7 +755,7 @@
 .TP
 .ie t \(bu
 .el o
-It has an entry in \fB/etc/utmpx\fR of type LOGIN_PROCESS
+It has an entry in \fB/var/adm/utmpx\fR of type LOGIN_PROCESS
 .RE
 .RS +4
 .TP

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.comsat.c	Mon May 20 12:52:22 2019 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.comsat.c	Mon May 20 14:23:00 2019 -0400
@@ -61,7 +61,7 @@
 
 
 #ifndef UTMPX_FILE
-#define	UTMPX_FILE "/etc/utmpx"
+#define	UTMPX_FILE "/var/adm/utmpx"
 #endif	/* UTMPX_FILE */
 
 int	debug = 0;

--- a/usr/src/cmd/last/Makefile	Mon May 20 12:52:22 2019 -0400
+++ b/usr/src/cmd/last/Makefile	Mon May 20 14:23:00 2019 -0400
@@ -27,7 +27,6 @@
 UTMPS= wtmpx
 ROOTADM= $(ROOT)/var/adm
 ROOTUTMPS= $(UTMPS:%=$(ROOTADM)/%)
-SYMSETC= $(UTMPS:%=symlinks_%)
 ETCTOVARADM= ../var/adm
 
 include ../Makefile.cmd
@@ -43,14 +42,11 @@
 $(UTMPS):
 	touch $@
 
-symlinks_% : %
-	-$(RM) $(ROOTETC)/$< ; $(SYMLINK) $(ETCTOVARADM)/$< $(ROOTETC)/$<
-
 .KEEP_STATE:
 
 all: $(PROG) $(UTMPS)
 
-install: all $(ROOTPROG) $(SYMSETC) $(ROOTUTMPS)
+install: all $(ROOTPROG) $(ROOTUTMPS)
 
 clean:
 	$(RM) $(UTMPS)

--- a/usr/src/cmd/utmpd/utmpd.c	Mon May 20 12:52:22 2019 -0400
+++ b/usr/src/cmd/utmpd/utmpd.c	Mon May 20 14:23:00 2019 -0400
@@ -44,7 +44,7 @@
  *		its utmpx entry on termination.
  *		The program keeps a list of procs
  *		and uses poll() on their /proc files to detect termination.
- *		Also the  program periodically scans the /etc/utmpx file for
+ *		Also the  program periodically scans the /var/adm/utmpx file for
  *		processes that aren't in the table so they can be watched.
  *
  *		If utmpd doesn't hear back over the pipe from pututline(3) that

--- a/usr/src/cmd/who/Makefile	Mon May 20 12:52:22 2019 -0400
+++ b/usr/src/cmd/who/Makefile	Mon May 20 14:23:00 2019 -0400
@@ -27,7 +27,6 @@
 UTMPS= utmpx
 ROOTADM= $(ROOT)/var/adm
 ROOTUTMPS= $(UTMPS:%=$(ROOTADM)/%)
-SYMSETC= $(UTMPS:%=$(ROOTETC)/%)
 CLOBBERFILES += $(UTMPS)
 
 include ../Makefile.cmd
@@ -48,10 +47,7 @@
 $(UTMPS):
 	touch $@
 
-install: all $(ROOTPROG) $(ROOTUTMPS) $(SYMSETC)
-
-$(SYMSETC):
-	-$(RM) $@; $(SYMLINK) ../var/adm/$(@F) $@
+install: all $(ROOTPROG) $(ROOTUTMPS)
 
 clean:
 

--- a/usr/src/lib/libc/port/gen/getutx.c	Mon May 20 12:52:22 2019 -0400
+++ b/usr/src/lib/libc/port/gen/getutx.c	Mon May 20 14:23:00 2019 -0400
@@ -39,7 +39,7 @@
 
 
 /*
- * Routines to read and write the /etc/utmpx file. Also contains
+ * Routines to read and write the /var/adm/utmpx file. Also contains
  * binary compatibility routines to support the old utmp interfaces
  * on systems with MAXPID <= SHRT_MAX.
  */
@@ -814,7 +814,7 @@
 	endutxent();
 
 	/*
-	 * If the file is being changed to /etc/utmpx or /var/adm/utmpx then
+	 * If the file is being changed to /var/adm/utmpx or /var/adm/utmpx then
 	 * we clear the flag so pututxline invokes utmp_update.  Otherwise
 	 * we set the flag indicating that they changed to another name.
 	 */

--- a/usr/src/pkg/manifests/system-core-os.mf	Mon May 20 12:52:22 2019 -0400
+++ b/usr/src/pkg/manifests/system-core-os.mf	Mon May 20 14:23:00 2019 -0400
@@ -1319,8 +1319,6 @@
 link path=etc/rc6 target=../sbin/rc6
 link path=etc/rcS target=../sbin/rcS
 link path=etc/services target=./inet/services
-link path=etc/utmpx target=../var/adm/utmpx
-link path=etc/wtmpx target=../var/adm/wtmpx
 link path=sbin/in.mpathd target=../lib/inet/in.mpathd
 link path=sbin/pfsh target=../usr/bin/pfexec
 link path=usr/adm target=../var/adm