diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
index 84c4a68aba0..cf5f760cda4 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/pkgs/tools/security/neopg/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchgit
+, fetchFromGitHub
 , cmake
 , sqlite
 , botan2
@@ -14,11 +14,12 @@ stdenv.mkDerivation rec {
   name = "neopg-${version}";
   version = "0.0.4";
 
-  # no fetchFromGitHub, as repo contains submodules
-  src = fetchgit {
-    url = "https://github.com/das-labor/neopg.git";
+  src = fetchFromGitHub {
+    owner = "das-labor";
+    repo = "neopg";
     rev = "v${version}";
     sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ pkgconfig ];