diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index 829b42af362f..e086f6f6e394 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,28 +30,35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)unistd.h	5.14 (Berkeley) 4/1/91
- *	$Id: unistd.h,v 1.6 1994/03/16 01:40:21 glass Exp $
+ *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
  */
 
 #ifndef _SYS_UNISTD_H_
-#define _SYS_UNISTD_H_
+#define	_SYS_UNISTD_H_
 
 /* compile-time symbolic constants */
 #define	_POSIX_JOB_CONTROL	/* implementation supports job control */
-#ifdef _NOTYET
+
+/*
+ * Although we have saved user/group IDs, we do not use them in setuid
+ * as described in POSIX 1003.1, because the feature does not work for
+ * root.  We use the saved IDs in seteuid/setegid, which are not currently
+ * part of the POSIX 1003.1 specification.
+ */
+#ifdef	_NOT_AVAILABLE
 #define	_POSIX_SAVED_IDS	/* saved set-user-ID and set-group-ID */
 #endif
 
 #define	_POSIX_VERSION		198808L
-#define _POSIX2_VERSION         199209L
+#define	_POSIX2_VERSION		199212L
 
 /* execution-time symbolic constants */
-                                   
-#define	_POSIX_CHOWN_RESTRICTED	1 /* chown requires appropriate privileges */
-#define	_POSIX_NO_TRUNC	        1 /* too-long path components generate errors*/
+				/* chown requires appropriate privileges */
+#define	_POSIX_CHOWN_RESTRICTED	1
+				/* too-long path components generate errors */
+#define	_POSIX_NO_TRUNC		1
 				/* may disable terminal special characters */
-#define	_POSIX_VDISABLE	((unsigned char)'\377')
+#define	_POSIX_VDISABLE		((unsigned char)'\377')
 
 /* access function */
 #define	F_OK		0	/* test for existence of file */
@@ -72,45 +79,46 @@
 #endif
 
 /* configurable pathname variables */
-#define	_PC_LINK_MAX		1
-#define	_PC_MAX_CANON		2
-#define	_PC_MAX_INPUT		3
-#define	_PC_NAME_MAX		4
-#define	_PC_PATH_MAX		5
-#define	_PC_PIPE_BUF		6
-#define	_PC_CHOWN_RESTRICTED	7
-#define	_PC_NO_TRUNC		8
-#define	_PC_VDISABLE		9
+#define	_PC_LINK_MAX		 1
+#define	_PC_MAX_CANON		 2
+#define	_PC_MAX_INPUT		 3
+#define	_PC_NAME_MAX		 4
+#define	_PC_PATH_MAX		 5
+#define	_PC_PIPE_BUF		 6
+#define	_PC_CHOWN_RESTRICTED	 7
+#define	_PC_NO_TRUNC		 8
+#define	_PC_VDISABLE		 9
 
 /* configurable system variables */
-#define	_SC_ARG_MAX		1
-#define	_SC_CHILD_MAX		2
-#define	_SC_CLK_TCK		3
-#define	_SC_NGROUPS_MAX		4
-#define	_SC_OPEN_MAX		5
-#define	_SC_JOB_CONTROL		6
-#define	_SC_SAVED_IDS		7
-#define _SC_STREAM_MAX		8
-#define _SC_TZNAME_MAX		9
-#define	_SC_VERSION		10
+#define	_SC_ARG_MAX		 1
+#define	_SC_CHILD_MAX		 2
+#define	_SC_CLK_TCK		 3
+#define	_SC_NGROUPS_MAX		 4
+#define	_SC_OPEN_MAX		 5
+#define	_SC_JOB_CONTROL		 6
+#define	_SC_SAVED_IDS		 7
+#define	_SC_VERSION		 8
+#define	_SC_BC_BASE_MAX		 9
+#define	_SC_BC_DIM_MAX		10
+#define	_SC_BC_SCALE_MAX	11
+#define	_SC_BC_STRING_MAX	12
+#define	_SC_COLL_WEIGHTS_MAX	13
+#define	_SC_EXPR_NEST_MAX	14
+#define	_SC_LINE_MAX		15
+#define	_SC_RE_DUP_MAX		16
+#define	_SC_2_VERSION		17
+#define	_SC_2_C_BIND		18
+#define	_SC_2_C_DEV		19
+#define	_SC_2_CHAR_TERM		20
+#define	_SC_2_FORT_DEV		21
+#define	_SC_2_FORT_RUN		22
+#define	_SC_2_LOCALEDEF		23
+#define	_SC_2_SW_DEV		24
+#define	_SC_2_UPE		25
+#define	_SC_STREAM_MAX		26
+#define	_SC_TZNAME_MAX		27
 
-#define _SC_BC_BASE_MAX		11
-#define _SC_BC_DIM_MAX		12
-#define _SC_BC_SCALE_MAX	13
-#define _SC_BC_STRING_MAX	14
-#define _SC_COLL_WEIGHTS_MAX	15
-#define _SC_EXPR_NEST_MAX	16
-#define _SC_LINE_MAX		17
-#define _SC_RE_DUP_MAX		18
-#define _SC_2_VERSION		19
-#define _SC_2_C_DEV		20
-#define _SC_2_CHAR_TERM		21
-#define _SC_2_FORT_DEV		22
-#define _SC_2_FORT_RUN		23
-#define _SC_2_LOCALEDEF		24
-#define _SC_2_SW_DEV		25
-#define _SC_2_UPE		26
-
-#define _CS_PATH		1
+/* configurable system strings */
+#define	_CS_PATH		 1
 
 #endif /* !_SYS_UNISTD_H_ */