diff --git a/ChangeLog b/ChangeLog
index 7b6300de..63a36328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
 
+  20 Apr 2007; Mike Frysinger <vapier@gentoo.org>:
+
+    Automatically mount selinuxfs on /selinux in localmount.
+
   20 Apr 2007; Roy Marples <uberlord@gentoo.org>:
 
     Plugins now run in a forked process for extra resliance.
diff --git a/init.d/localmount b/init.d/localmount
index 303f5a2c..13172d43 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -75,21 +75,32 @@ start() {
 
 		# Setup Kernel Support for miscellaneous Binary Formats
 		if [ -d /proc/sys/fs/binfmt_misc ] ; then
-			if [ -n "$(grep -Fow binfmt_misc /proc/filesystems)" ] ; then
+			if grep -qs binfmt_misc /proc/filesystems ; then
 				ebegin "Mounting misc binary format filesystem"
 				mount -t binfmt_misc -o nodev,noexec,nosuid \
 					binfmt_misc /proc/sys/fs/binfmt_misc
 				eend $?
 			fi
 		fi
+
+		# Setup Kernel Support for securityfs
 		if [ -d /sys/kernel/security ] ; then
-			if [ -n "$(grep -Fow securityfs /proc/filesystems)" ] ; then
+			if grep -qs securityfs /proc/filesystems ; then
 				ebegin "Mounting security filesystem"
-					mount -t securityfs securityfs /sys/kernel/security \
+				mount -t securityfs securityfs /sys/kernel/security \
 					-o nodev,noexec,nosuid
 				eend $?
 			fi
-		fi	
+		fi
+
+		# Setup Kernel Support for SELinux
+		if [ -d /selinux ] ; then
+			if grep -qs selinuxfs /proc/filesystems ; then
+				ebegin "Mounting SELinux filesystem"
+				mount -t selinuxfs selinuxfs /selinux
+				eend $?
+			fi
+		fi
 	fi
 
 	# We do our swapping here instead of rc so we can get urandom started