diff --git a/sys/conf/options b/sys/conf/options
index 3dba59e53912..67b16b7e8572 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,6 +1,12 @@
 DDB
+FDESC		opt_staticfs.h
+KERNFS		opt_staticfs.h
 KTRACE
-PROCFS
+NULLFS		opt_staticfs.h
+PORTAL		opt_staticfs.h
+PROCFS		opt_staticfs.h
 SYSVSHM		opt_sysvipc.h
 SYSVSEM		opt_sysvipc.h
 SYSVMSG		opt_sysvipc.h
+UMAPFS		opt_staticfs.h
+UNION		opt_staticfs.h
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index a1e3087a0ad2..88231fe115de 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,9 +36,18 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.43 1995/12/11 04:56:11 dyson Exp $
+ * $Id: vfs_syscalls.c,v 1.44 1995/12/17 21:23:22 phk Exp $
  */
 
+/*
+ * XXX - The following is required because of some magic done 
+ * in getdirentries() below which is only done if the translucent
+ * filesystem `UNION' is compiled into the kernel.  This is broken,
+ * but I don't have time to study the code deeply enough to understand
+ * what's going on and determine an appropriate fix.  -GAW
+ */
+#include "opt_staticfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index a1e3087a0ad2..88231fe115de 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,9 +36,18 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.43 1995/12/11 04:56:11 dyson Exp $
+ * $Id: vfs_syscalls.c,v 1.44 1995/12/17 21:23:22 phk Exp $
  */
 
+/*
+ * XXX - The following is required because of some magic done 
+ * in getdirentries() below which is only done if the translucent
+ * filesystem `UNION' is compiled into the kernel.  This is broken,
+ * but I don't have time to study the code deeply enough to understand
+ * what's going on and determine an appropriate fix.  -GAW
+ */
+#include "opt_staticfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>