diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index a47558256f3..c904e86196f 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -56,6 +56,15 @@ trlld.o				optional	oltr			\
 	compile-with	"uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
 	no-implicit-rule
 #
+compat/linux/linux_file.c	optional	compat_linux
+compat/linux/linux_ioctl.c	optional	compat_linux
+compat/linux/linux_ipc.c	optional	compat_linux
+compat/linux/linux_mib.c	optional	compat_linux
+compat/linux/linux_misc.c	optional	compat_linux
+compat/linux/linux_signal.c	optional	compat_linux
+compat/linux/linux_socket.c	optional	compat_linux
+compat/linux/linux_stats.c	optional	compat_linux
+compat/linux/linux_util.c	optional	compat_linux
 contrib/dev/fla/fla.c		optional	fla
 contrib/dev/oltr/if_oltr.c	optional	oltr
 contrib/dev/oltr/trlldbm.c	optional	oltr
@@ -313,19 +322,11 @@ i386/isa/vesa.c			optional	vga vesa
 i386/isa/wt.c			count		wt
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux
-i386/linux/linux_file.c		optional	compat_linux
-i386/linux/linux_ioctl.c	optional	compat_linux
-i386/linux/linux_ipc.c		optional	compat_linux
 i386/linux/linux_locore.s	optional	compat_linux		\
 	dependency 	"linux_assym.h"
-i386/linux/linux_mib.c		optional	compat_linux
-i386/linux/linux_misc.c		optional	compat_linux
-i386/linux/linux_signal.c	optional	compat_linux
-i386/linux/linux_socket.c	optional	compat_linux
-i386/linux/linux_stats.c	optional	compat_linux
+i386/linux/linux_machdep.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
-i386/linux/linux_util.c		optional	compat_linux
 i386/svr4/svr4_locore.s		optional	compat_svr4		\
 	dependency	"svr4_assym.h"
 i386/svr4/svr4_machdep.c	optional	compat_svr4
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 61003debd29..742fb7723c0 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -53,6 +53,15 @@ trlld.o				optional	oltr			\
 	compile-with	"uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
 	no-implicit-rule
 #
+compat/linux/linux_file.c	optional	compat_linux
+compat/linux/linux_ioctl.c	optional	compat_linux
+compat/linux/linux_ipc.c	optional	compat_linux
+compat/linux/linux_mib.c	optional	compat_linux
+compat/linux/linux_misc.c	optional	compat_linux
+compat/linux/linux_signal.c	optional	compat_linux
+compat/linux/linux_socket.c	optional	compat_linux
+compat/linux/linux_stats.c	optional	compat_linux
+compat/linux/linux_util.c	optional	compat_linux
 contrib/dev/fla/fla.c		optional	fla
 contrib/dev/oltr/if_oltr.c	optional	oltr
 contrib/dev/oltr/trlldbm.c	optional	oltr
@@ -296,19 +305,11 @@ i386/isa/tw.c			count		tw
 i386/isa/wt.c			count		wt
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux
-i386/linux/linux_file.c		optional	compat_linux
-i386/linux/linux_ioctl.c	optional	compat_linux
-i386/linux/linux_ipc.c		optional	compat_linux
 i386/linux/linux_locore.s	optional	compat_linux		\
 	dependency 	"linux_assym.h"
-i386/linux/linux_mib.c		optional	compat_linux
-i386/linux/linux_misc.c		optional	compat_linux
-i386/linux/linux_signal.c	optional	compat_linux
-i386/linux/linux_socket.c	optional	compat_linux
-i386/linux/linux_stats.c	optional	compat_linux
+i386/linux/linux_machdep.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
-i386/linux/linux_util.c		optional	compat_linux
 i386/svr4/svr4_locore.s		optional	compat_svr4		\
 	dependency	"svr4_assym.h"
 i386/svr4/svr4_machdep.c	optional	compat_svr4
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 2dd5fc611ca..bbd64290d5b 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../${MACHINE_ARCH}/linux
+.PATH:	${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux
 
 MAINTAINER=	marcel@FreeBSD.org
 
 KMOD=	linux
-SRCS=	linux_file.c linux_ioctl.c linux_misc.c linux_signal.c \
-	linux_ipc.c linux_socket.c linux_stats.c linux_mib.c \
+SRCS=	linux_file.c linux_ioctl.c linux_machdep.c linux_misc.c \
+	linux_signal.c linux_ipc.c linux_socket.c linux_stats.c linux_mib.c \
 	linux_dummy.c linux_sysent.c linux_sysvec.c linux_util.c \
 	imgact_linux.c opt_compat.h opt_linux.h opt_vmpage.h vnode_if.h
 OBJS=	linux_locore.o
 MAN8=	linux.8
 
-# CFLAGS+=	-DDEBUG
 EXPORT_SYMS=_linux_mod
 CLEANFILES= linux_assym.h linux_genassym.o