diff --git a/pkgs/tools/security/aefs/default.nix b/pkgs/tools/security/aefs/default.nix
new file mode 100644
index 00000000000..8cc3176c34f
--- /dev/null
+++ b/pkgs/tools/security/aefs/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, fuse}:
+  
+stdenv.mkDerivation {
+  name = "aefs-0.3pre279";
+  
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/aefs-0.3pre279.tar.bz2;
+    sha256 = "1gsa55cmhgj124m2laxcxcrgh45rsmp9jwz9wc9q515np9s7h11c";
+  };
+
+  buildInputs = [fuse];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 091f6dd7eaf..75a99881728 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -218,6 +218,10 @@ rec {
   ### TOOLS
 
 
+  aefs = import ../tools/security/aefs {
+    inherit fetchurl stdenv fuse;
+  };
+
   azureus = import ../tools/networking/p2p/azureus {
     inherit fetchurl stdenv jdk swt;
   };