diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix
new file mode 100644
index 00000000000..9ad9ddb433f
--- /dev/null
+++ b/pkgs/development/python-modules/lmtpd/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "lmtpd";
+  version = "6.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "192d1j9lj9i6f4llwg51817am4jj8pjvlqmkx03spmsay6f832bm";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/moggers87/lmtpd;
+    description = "LMTP counterpart to smtpd in the Python standard library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/development/python-modules/salmon/default.nix b/pkgs/development/python-modules/salmon/default.nix
new file mode 100644
index 00000000000..2169689f3d4
--- /dev/null
+++ b/pkgs/development/python-modules/salmon/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dns
+,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
+
+buildPythonPackage rec {
+  pname = "salmon";
+  # NOTE: The latest release version 2 is over 3 years old. So let's use some
+  # recent commit from master. There will be a new release at some point, then
+  # one can change this to use PyPI. See:
+  # https://github.com/moggers87/salmon/issues/52
+  version = "bec795cdab744be4f103d8e35584dfee622ddab2";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "moggers87";
+    repo = "salmon";
+    rev = version;
+    sha256 = "0nx8pyxy7n42nsqqvhd85ycm1i5wlacsi7lwb4rrs9d416bpd300";
+  };
+
+  checkInputs = [ nose jinja2 mock ];
+  propagatedBuildInputs = [ chardet dns lmtpd pythondaemon six ];
+
+  meta = with stdenv.lib; {
+    homepage = http://salmon-mail.readthedocs.org/;
+    description = "Pythonic mail application server";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7059f1749c2..01d7c152c8e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -230,6 +230,8 @@ in {
 
   intelhex = callPackage ../development/python-modules/intelhex { };
 
+  lmtpd = callPackage ../development/python-modules/lmtpd { };
+
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };
@@ -344,6 +346,8 @@ in {
 
   rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});
 
+  salmon = callPackage ../development/python-modules/salmon { };
+
   simpleeval = callPackage ../development/python-modules/simpleeval { };
 
   sip = callPackage ../development/python-modules/sip { };