diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix
index bc874427f2b..1668f300fa8 100644
--- a/pkgs/os-specific/linux/aufs/default.nix
+++ b/pkgs/os-specific/linux/aufs/default.nix
@@ -1,15 +1,21 @@
 {stdenv, fetchurl, kernel}:
 
 stdenv.mkDerivation {
-  name = "aufs-20080128";
-  
+  name = "aufs-20080508";
+
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/aufs-20080128.tar.bz2;
-    sha256 = "0732zp6wfss09x9d6n0a3v65rifn739m9nffi5d3952vglg4va6l";
+    url = http://nixos.org/tarballs/aufs-20080508.tar.bz2;
+    sha256 = "1b7y6klk2fc6hf8w2la4k3yvxdvjibsnhv7d6mb12a7h13msjci6";
   };
 
-  buildPhase = ''
+  patches = [
+    (fetchurl {
+      url = http://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg01091/04_sec_perm.dpatch;
+      sha256 = "0b51dpks4d5qgysrakv2c1v076d9hc8ln2cbh012zi75b45gn4ir";
+    })
+  ];
 
+  buildPhase = ''
     kernelVersion=$(cd ${kernel}/lib/modules && ls)
     kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)
     tar xvfj ${kernel.src}
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.25.nix b/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
index ac1dfac56ac..ad1b0cc2797 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
@@ -28,7 +28,7 @@ let
 
   lib = import ../../../lib;
 
-  version = "2.6.25.2";
+  version = "2.6.25.4";
 
 in
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "11in4wm88syyrmnm9jv8w977hgw9n8zl8qvaz6zkq8qbyxh4frqi";
+    sha256 = "0hp36pwphw5rs9kwm5ksr7ynfmzgpcd8gi45rigbilvcvmsdnxf3";
   };
   
   patches = map (p: p.patch) kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch b/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch
new file mode 100644
index 00000000000..de9b29949c3
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch
@@ -0,0 +1,16 @@
+Index: linux-2.6.24-rc3/security/security.c
+===================================================================
+RCS file: /ext1/sysadm/transparent/repository/linux-2.6.24-rc3/security/security.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- linux-2.6.24-rc3/security/security.c	21 Nov 2007 13:03:11 -0000	1.1
++++ linux-2.6.24-rc3/security/security.c	21 Nov 2007 13:07:55 -0000	1.2
+@@ -409,6 +409,7 @@ int security_inode_permission(struct ino
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask, nd);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5170f9b3b63..0c0a08283ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4355,6 +4355,9 @@ let pkgs = rec {
         };
         extraConfig = "CONFIG_FB_CON_DECOR=y";
       }
+      { name = "sec_perm-2.6.24";
+        patch = ../os-specific/linux/kernel/sec_perm-2.6.24.patch;
+      }
     ];
     extraConfig =
       lib.optional (getConfig ["kernel" "timer_stats"] false) "CONFIG_TIMER_STATS=y" ++