Index: share/mk/bsd.init.mk
===================================================================
--- share/mk/bsd.init.mk
+++ share/mk/bsd.init.mk
@@ -24,20 +24,12 @@
 .export _uid
 .endif
 .if ${_uid} != 0
-.if !defined(USER)
-# Avoid exporting USER
-.if !defined(_USER)
-_USER!=	id -un
-.export _USER
-.endif
-USER=	${_USER}
-.endif
 .if !defined(_gid)
 _gid!=	id -g
 .export _gid
 .endif
 .for x in BIN CONF DOC DTB INFO KMOD LIB MAN NLS SHARE
-$xOWN=	${USER}
+$xOWN=	${_uid}
 $xGRP=	${_gid}
 .endfor
 .endif