diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 9cfbf8c63c27..d98b3b6be9d3 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -5,12 +5,12 @@ buildPythonPackage rec {
 
   src = fetchgit {
     url = "https://github.com/pagekite/Mailpile.git";
-    rev = "59b96150822780138ab3567502952caadbc1d73e";
-    sha256 = "2edf82cbe6d3f17ba776fb5a70caa553f646db30ce207ab957038d845a9677e1";
+    rev = "cbb3bbf1f1da653124e63e11a51a6864dcb534a0";
+    sha256 = "1m2qkhcygidxqnnj2ajsxv8y5wjyp5il3919sl3vyl47gx02xa8j";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    pillow jinja2 pythonPackages."lxml-2.3.6" python.modules.readline or null];
+    pillow jinja2 spambayes pythonPackages."lxml-2.3.6" python.modules.readline or null];
 
   meta = with stdenv.lib; {
     description = "A modern, fast web-mail client with user-friendly encryption and privacy features";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b2684c2f3eb..9e2e132a9a69 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6085,6 +6085,36 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  spambayes = buildPythonPackage rec {
+    name = "spambayes-1.1a6";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/spambayes/${name}.tar.gz";
+      sha256 = "0lqhn2v0avgwxmk4dq9lkwr2g39ls2p6x8hqk5w07wd462cjsx8l";
+    };
+
+    propagatedBuildInputs = [ pydns lockfile ];
+
+    meta = with stdenv.lib; {
+      description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
+      homepage = http://spambayes.sourceforge.net/;
+    };
+  };
+
+  pydns = buildPythonPackage rec {
+    name = "pydns-2.3.6";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pydns/${name}.tar.gz";
+      sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
+    };
+
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+    };
+  };
+
   sympy = buildPythonPackage rec {
     name = "sympy-0.7.3";