diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index 96a035f4a582..37e81f714290 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -1,21 +1,47 @@
-{ buildPythonPackage, fetchPypi, lib
-, authres, dnspython, dkimpy, publicsuffix2
+{ lib
+, authres
+, buildPythonPackage
+, dkimpy
+, dnspython
+, fetchFromGitHub
+, publicsuffix2
+, pythonOlder
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "authheaders";
-  version = "0.15.1";
+  version = "0.15.2";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "ValiMail";
+    repo = "authentication-headers";
+    rev = "refs/tags/${version}";
+    hash = "sha256-vtLt7JUdLF0gBWgMzP65UAR6A9BnTech5n0alFErcSQ=";
   };
 
-  propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ];
+  propagatedBuildInputs = [
+    authres
+    dnspython
+    dkimpy
+    publicsuffix2
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "authheaders"
+  ];
 
   meta = with lib; {
     description = "Python library for the generation of email authentication headers";
     homepage = "https://github.com/ValiMail/authentication-headers";
+    changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES";
     license = licenses.mit;
     maintainers = with maintainers; [ ];
   };