diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 62afcc2583a..ebc05a79af9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, heimdal
+, libheimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      heimdal
+      libheimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix
index 52751908fa7..edf56c3eb4d 100644
--- a/pkgs/applications/office/zotero/firefox-bin/default.nix
+++ b/pkgs/applications/office/zotero/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, heimdal
+, libheimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      heimdal
+      libheimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de0afef2fd5..a640579e227 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9097,7 +9097,7 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = heimdal;
+    kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
     gnutls = gnutls33;
     # enableLDAP
   };