diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index 24deb3b3d8a1..609955668e81 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -8,7 +8,7 @@ let
   rev  = "master@{${date}}";
 in
 stdenv.mkDerivation ({
-  name = "hurd-${date}";
+  name = "hurd${if headersOnly then "-headers" else ""}-${date}";
 
   src = fetchgit {
     url = "git://git.sv.gnu.org/hurd/hurd.git";
diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix
index b79ef3a5c9dd..49f1f4883a3b 100644
--- a/pkgs/os-specific/gnu/mach/default.nix
+++ b/pkgs/os-specific/gnu/mach/default.nix
@@ -8,7 +8,7 @@ let
   rev = "master@{${date}}";
 in
 stdenv.mkDerivation ({
-  name = "gnumach-${date}";
+  name = "gnumach${if headersOnly then "-headers" else ""}-${date}";
 
   src = fetchgit {
     url = "git://git.sv.gnu.org/hurd/gnumach.git";