diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix
index 4e1080d2a108..e6828311c22f 100644
--- a/pkgs/build-support/fetchsavannah/default.nix
+++ b/pkgs/build-support/fetchsavannah/default.nix
@@ -11,7 +11,11 @@ lib.makeOverridable (
   fetchzip (
     {
       inherit name;
-      url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
+      url =
+        let
+          repo' = lib.last (lib.strings.splitString "/" repo); # support repo like emacs/elpa
+        in
+        "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo'}-${rev}.tar.gz";
       meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/";
       passthru.gitRepoUrl = "https://git.savannah.gnu.org/git/${repo}.git";
     }