diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 0f71560bdaf9..94639f2c95da 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -135,7 +135,7 @@ crypto/aesni/aesencdec_amd64.S	optional aesni
 crypto/aesni/aeskeys_amd64.S	optional aesni
 crypto/aesni/aesni.c		optional aesni
 crypto/aesni/aesni_wrap.c	optional aesni
-crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
+crypto/blowfish/bf_enc.c	optional	crypto | ipsec
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 crypto/via/padlock.c		optional	padlock
 crypto/via/padlock_cipher.c	optional	padlock
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index f8a4b5dcfd81..c88ca0cd18f4 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -472,7 +472,7 @@ i386/linux/linux_support.s	optional compat_linux	\
 i386/linux/linux_sysent.c	optional compat_linux
 i386/linux/linux_sysvec.c	optional compat_linux
 i386/pci/pci_cfgreg.c		optional pci
-i386/pci/pci_pir.c		optional pci 
+i386/pci/pci_pir.c		optional pci
 i386/svr4/svr4_locore.s		optional compat_svr4	\
 	dependency	"svr4_assym.h"	\
 	warning "COMPAT_SVR4 is broken and should be avoided"
@@ -516,7 +516,7 @@ x86/cpufreq/hwpstate.c		optional cpufreq
 x86/cpufreq/p4tcc.c		optional cpufreq
 x86/cpufreq/powernow.c		optional cpufreq
 x86/cpufreq/smist.c		optional cpufreq
-x86/isa/atpic.c			optional atpic	
+x86/isa/atpic.c			optional atpic
 x86/isa/atrtc.c			optional native
 x86/isa/clock.c			optional native
 x86/isa/elcr.c			optional atpic | apic native
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 486151fb1631..cbb7ac173f01 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -708,7 +708,7 @@ _padlock=	padlock
 .endif
 _pccard=	pccard
 _qlxgb=		qlxgb
-_rdma=		rdma	
+_rdma=		rdma
 _s3=		s3
 _safe=		safe
 _scsi_low=	scsi_low