diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index ffa3604071c7..3e5fda341e50 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.27 1994/01/20 17:49:57 davidg Exp $
+ *	$Id: machdep.c,v 1.28 1994/01/20 23:17:39 davidg Exp $
  */
 
 #include "npx.h"
@@ -64,6 +64,14 @@
 #include "sys/shm.h"
 #endif
 
+#ifdef SYSVMSG
+#include "msg.h"
+#endif
+
+#ifdef SYSVSEM
+#include "sem.h"
+#endif
+
 #include "vm/vm.h"
 #include "vm/vm_kern.h"
 #include "vm/vm_page.h"
@@ -186,6 +194,18 @@ cpu_startup()
 	valloc(callout, struct callout, ncallout);
 #ifdef SYSVSHM
 	valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
+#endif
+#ifdef SYSVSEM
+	valloc(sema, struct semid_ds, seminfo.semmni);
+	valloc(sem, struct sem, seminfo.semmns);
+	/* This is pretty disgusting! */
+	valloc(semu, int, (seminfo.semmnu * seminfo.semusz) / sizeof(int));
+#endif
+#ifdef SYSVMSG
+	valloc(msgpool, char, msginfo.msgmax);
+	valloc(msgmaps, struct msgmap, msginfo.msgseg);
+	valloc(msghdrs, struct msg, msginfo.msgtql);
+	valloc(msqids, struct msqid_ds, msginfo.msgmni);
 #endif
 	/*
 	 * Determine how many buffers to allocate.
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 3a96ee400f88..b51c39c12d0b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.40 1994/01/16 12:01:32 ats Exp $
+#	$Id: LINT,v 1.41 1994/01/17 05:45:26 rgrimes Exp $
 #
 
 machine		"i386"
@@ -84,8 +84,11 @@ pseudo-device	sl	2
 device		st0
 device		st1
 pseudo-device	swappager
+options         SYSVIPC                 #define if have any SYSV mechanisms
 options		SYSVSHM
 options		"SHMMAXPGS=64"		# 256Kb of sharable memory
+options         SYSVSEM
+options         SYSVMSG
 #pseudo-device	tb			#tablet line discipline.
 options		TPIP			# ISO TP class 4 over IP
 #pseudo-device	tun
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 3a96ee400f88..b51c39c12d0b 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.40 1994/01/16 12:01:32 ats Exp $
+#	$Id: LINT,v 1.41 1994/01/17 05:45:26 rgrimes Exp $
 #
 
 machine		"i386"
@@ -84,8 +84,11 @@ pseudo-device	sl	2
 device		st0
 device		st1
 pseudo-device	swappager
+options         SYSVIPC                 #define if have any SYSV mechanisms
 options		SYSVSHM
 options		"SHMMAXPGS=64"		# 256Kb of sharable memory
+options         SYSVSEM
+options         SYSVMSG
 #pseudo-device	tb			#tablet line discipline.
 options		TPIP			# ISO TP class 4 over IP
 #pseudo-device	tun
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3a96ee400f88..b51c39c12d0b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.40 1994/01/16 12:01:32 ats Exp $
+#	$Id: LINT,v 1.41 1994/01/17 05:45:26 rgrimes Exp $
 #
 
 machine		"i386"
@@ -84,8 +84,11 @@ pseudo-device	sl	2
 device		st0
 device		st1
 pseudo-device	swappager
+options         SYSVIPC                 #define if have any SYSV mechanisms
 options		SYSVSHM
 options		"SHMMAXPGS=64"		# 256Kb of sharable memory
+options         SYSVSEM
+options         SYSVMSG
 #pseudo-device	tb			#tablet line discipline.
 options		TPIP			# ISO TP class 4 over IP
 #pseudo-device	tun
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index ffa3604071c7..3e5fda341e50 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.27 1994/01/20 17:49:57 davidg Exp $
+ *	$Id: machdep.c,v 1.28 1994/01/20 23:17:39 davidg Exp $
  */
 
 #include "npx.h"
@@ -64,6 +64,14 @@
 #include "sys/shm.h"
 #endif
 
+#ifdef SYSVMSG
+#include "msg.h"
+#endif
+
+#ifdef SYSVSEM
+#include "sem.h"
+#endif
+
 #include "vm/vm.h"
 #include "vm/vm_kern.h"
 #include "vm/vm_page.h"
@@ -186,6 +194,18 @@ cpu_startup()
 	valloc(callout, struct callout, ncallout);
 #ifdef SYSVSHM
 	valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
+#endif
+#ifdef SYSVSEM
+	valloc(sema, struct semid_ds, seminfo.semmni);
+	valloc(sem, struct sem, seminfo.semmns);
+	/* This is pretty disgusting! */
+	valloc(semu, int, (seminfo.semmnu * seminfo.semusz) / sizeof(int));
+#endif
+#ifdef SYSVMSG
+	valloc(msgpool, char, msginfo.msgmax);
+	valloc(msgmaps, struct msgmap, msginfo.msgseg);
+	valloc(msghdrs, struct msg, msginfo.msgtql);
+	valloc(msqids, struct msqid_ds, msginfo.msgmni);
 #endif
 	/*
 	 * Determine how many buffers to allocate.