diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c
index e59dca38ff72..278faa917e5e 100644
--- a/sys/dev/filemon/filemon_wrapper.c
+++ b/sys/dev/filemon/filemon_wrapper.c
@@ -656,12 +656,10 @@ filemon_wrapper_vfork(struct thread *td, struct vfork_args *uap)
 static void
 filemon_wrapper_install(void)
 {
-#if defined(__i386__)
-	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
-#elif defined(__amd64__)
+#if defined(__LP64__)
 	struct sysent *sv_table = elf64_freebsd_sysvec.sv_table;
 #else
-#error Machine type not supported
+	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
 #endif
 
 	sv_table[SYS_chdir].sy_call = (sy_call_t *) filemon_wrapper_chdir;
@@ -702,12 +700,10 @@ filemon_wrapper_install(void)
 static void
 filemon_wrapper_deinstall(void)
 {
-#if defined(__i386__)
-	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
-#elif defined(__amd64__)
+#if defined(__LP64__)
 	struct sysent *sv_table = elf64_freebsd_sysvec.sv_table;
 #else
-#error Machine type not supported
+	struct sysent *sv_table = elf32_freebsd_sysvec.sv_table;
 #endif
 
 	sv_table[SYS_chdir].sy_call = (sy_call_t *)sys_chdir;
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 80ac632fffbf..9922d62814c0 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -106,7 +106,7 @@ SUBDIR=	\
 	fdc \
 	fdescfs \
 	${_fe} \
-	${_filemon} \
+	filemon \
 	firewire \
 	firmware \
 	${_fxp} \
@@ -360,10 +360,6 @@ SUBDIR=	\
 	${_zfs} \
 	zlib \
 
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-_filemon=	filemon
-.endif
-
 .if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_CPUARCH} != "mips"
 _syscons=	syscons