diff --git a/.abf.yml b/.abf.yml
index 7190359..df79d50 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
   "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
   "patch-3.14.25.xz": 240907ba50ae05164c9a8d1fd53b79fd73ff1e73
-  "kernel-patches-and-configs-3.14.25.tar.xz": a062acfd9c9bbaea506ee51279a99a7a808a8d27
+  "kernel-patches-and-configs-3.14.25.tar.xz": d4f9717759028a96d8520ef912c7ed0e192cc3c7
diff --git a/kernel-1.spec b/kernel-1.spec
index fd48094..0a6b404 100644
--- a/kernel-1.spec
+++ b/kernel-1.spec
@@ -1,4 +1,5 @@
-#
+%{?build_selinux}%{?!build_selinux:%bcond_with selinux}
+
 %define kernelversion	3
 %define patchlevel	14
 # sublevel is now used for -stable patches
@@ -28,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		2
+%define rpmrel		3
 %endif
 
 # fakerel and fakever never change, they are used to fool
@@ -958,7 +959,7 @@ Buildarch:	noarch
 
 %description -n %{kname}-source-%{buildrel}
 The %{kname}-source package contains the source code files for the Mandriva and
-ROSA kernel. Theese source files are only needed if you want to build your own
+ROSA kernel. These source files are only needed if you want to build your own
 custom kernel that is better tuned to your particular hardware.
 
 If you only want the files needed to build 3rdparty (nVidia, Ati, dkms-*,...)
@@ -1130,12 +1131,8 @@ cd %src_dir
 
 %{patches_dir}/scripts/apply_patches
 %{patches_dir}/scripts/apply_patches-NRJ
-# %{patches_dir}/scripts/apply_patches-NRJ-only
 %{patches_dir}/scripts/apply_patches-geek
 %{patches_dir}/scripts/apply_patches-latest
-# %{patches_dir}/scripts/apply_patches-QL
-# PATCH END
-
 
 #
 # Setup Begin
@@ -1149,9 +1146,14 @@ cd %src_dir
 %define debug --no-debug
 %endif
 
+%if %{with selinux}
+# Enable SELinux, memory sanitization, etc.
+%define enhanced_security --with-enhanced-security
+%else
+%define enhanced_security %{nil}
+%endif
 
-#%{patches_dir}/scripts/create_configs %debug --user_cpu="%{target_arch}"
-%{patches_dir}/scripts/create_configs-withBFQ %debug --user_cpu="%{target_arch}"
+%{patches_dir}/scripts/create_configs-withBFQ %debug %enhanced_security --user_cpu="%{target_arch}"
 
 # make sure the kernel has the sublevel we know it has...
 LC_ALL=C perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{sublevel}/" Makefile
@@ -1300,6 +1302,11 @@ SaveDevel() {
 	# aufs2 has a special file needed
 	cp -fR fs/aufs/magic.mk $TempDevelRoot/fs/aufs
 
+%if %{with selinux}
+	# SELinux needs security/selinux/include
+	cp -fR security/selinux/include $TempDevelRoot/security/selinux
+%endif
+
 	for i in alpha arc avr32 blackfin c6x cris frv h8300 hexagon ia64 m32r m68k m68knommu metag microblaze \
 		 mips mn10300 openrisc parisc powerpc s390 score sh sparc tile unicore32 xtensa; do
 		rm -rf $TempDevelRoot/arch/$i