diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index 352858dfccc4..84ee720597ff 100644
--- a/sys/compat/svr4/svr4.h
+++ b/sys/compat/svr4/svr4.h
@@ -35,17 +35,5 @@
 extern struct sysentvec svr4_sysvec;
 
 #define COMPAT_SVR4_SOLARIS2
-#define KTRACE
-
-/* These are currently unimplemented (see svr4_ipc.c) */
-#if defined(SYSVMSG)
-# undef SYSVMSG
-#endif
-#if defined(SYSVSHM)
-# undef SYSVSHM
-#endif
-#if defined(SYSVSEM)
-# undef SYSVSEM
-#endif
 
 #endif
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index e11c84cfaee4..bd6fa5af0e13 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -38,8 +38,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define COMPAT_43 1
-
+#include "opt_compat.h"
+#include "opt_ktrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index da0e7cf494df..279e477133a1 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -96,17 +96,14 @@
 47	AUE_NULL	MNOPROTO { gid_t getgid(void); }
 48	AUE_NULL	MSTD	{ int svr4_sys_signal(int signum, \
 				    svr4_sig_t handler); }
-#if defined(NOTYET)
 49	AUE_NULL	STD	{ int svr4_sys_msgsys(int what, int a2, \
-				    int a3, int a4, \
-		    int a5); }
-#else
-49	AUE_NULL	UNIMPL	msgsys
-#endif
+				    int a3, int a4, int a5); }
 50	AUE_NULL	STD	{ int svr4_sys_sysarch(int op, void *a1); }
 51	AUE_NULL	UNIMPL	acct
-52	AUE_NULL	UNIMPL	shmsys
-53	AUE_NULL	UNIMPL	semsys
+52	AUE_NULL	STD	{ int svr4_sys_shmsys(int what, int a2, \
+				    int a3, int a4, int a5); }
+53	AUE_NULL	STD	{ int svr4_sys_semsys(int what, int a2, \
+				    int a3, int a4, int a5); }
 54	AUE_NULL	STD	{ int svr4_sys_ioctl(int fd, u_long com, \
 				    caddr_t data); }
 55	AUE_NULL	UNIMPL	uadmin