diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix
index 98bbef174ae7..c0df4d4a878e 100644
--- a/pkgs/development/python-modules/secretstorage/default.nix
+++ b/pkgs/development/python-modules/secretstorage/default.nix
@@ -1,23 +1,28 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage
-, dbus-python, cryptography }:
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }:
 
 buildPythonPackage rec {
   pname = "secretstorage";
-  version = "2.3.1";
+  version = "3.1.0";
 
-  src = fetchFromGitHub {
-    owner = "mitya57";
-    repo = "secretstorage";
-    rev = version;
-    sha256 = "1sjd2jjbxgkkxyrfwx89x0hsnn39w2cr2qkxbg1iz52znr4sqism";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    pname = "SecretStorage";
+    inherit version;
+    sha256 = "12vxzradibfmznssh7x2zd7qym2hl7wn34fn2yn58pnx6sykrai9";
   };
 
-  propagatedBuildInputs = [ dbus-python cryptography ];
+  propagatedBuildInputs = [
+    cryptography
+    jeepney
+    pygobject3
+  ];
 
-  doCheck = false; # requires dbus session
+  # Needs a D-Bus Sesison
+  doCheck = false;
 
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/mitya57/secretstorage";
+  meta = with lib; {
+    homepage = https://github.com/mitya57/secretstorage;
     description = "Python bindings to FreeDesktop.org Secret Service API";
     license = licenses.bsdOriginal;
     maintainers = with maintainers; [ teto ];