diff --git a/pkgs/development/python-modules/salmon/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
similarity index 64%
rename from pkgs/development/python-modules/salmon/default.nix
rename to pkgs/development/python-modules/salmon-mail/default.nix
index 916fc29d2074..37c7b157ea58 100644
--- a/pkgs/development/python-modules/salmon/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython
 ,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
 
 buildPythonPackage rec {
-  pname = "salmon";
-  version = "3.0.0";
   name = "${pname}-${version}";
+  pname = "salmon-mail";
+  version = "3.0.0";
 
-  src = fetchFromGitHub {
-    owner = "moggers87";
-    repo = "salmon";
-    rev = version;
-    sha256 = "0ffnvvms9w5b2hkwq0ss018vadg5n7xwhc51dlrfynddhrf9p3m3";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18";
   };
 
   checkInputs = [ nose jinja2 mock ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c1cc710c13a..a601058b7c11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -354,7 +354,7 @@ in {
 
   rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});
 
-  salmon = callPackage ../development/python-modules/salmon { };
+  salmon-mail = callPackage ../development/python-modules/salmon-mail { };
 
   simpleeval = callPackage ../development/python-modules/simpleeval { };