diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 8ea2ac72da0..a9117556a7f 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, cmake
 
 # Optional Dependencies
-, heimdal ? null, zlib ? null, libsodium ? null
+, libheimdal ? null, zlib ? null, libsodium ? null
 
 # Crypto Dependencies
 , openssl ? null, libgcrypt ? null
@@ -19,7 +19,7 @@ let
     none = null;
   }.${cryptoStr};
 
-  optHeimdal = shouldUsePkg heimdal;
+  optLibheimdal = shouldUsePkg libheimdal;
   optZlib = shouldUsePkg zlib;
   optLibsodium = shouldUsePkg libsodium;
 in
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
-    "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
+    "-DWITH_GSSAPI=${if optLibheimdal != null then "ON" else "OFF"}"
     "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}"
     "-DWITH_SSH1=OFF"
     "-DWITH_SFTP=ON"
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
+  buildInputs = [ optLibheimdal optZlib optLibsodium crypto ];
 
   meta = with stdenv.lib; {
     description = "SSH client library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbac4657cf2..afe7947e4f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8973,7 +8973,7 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = heimdal;
+    kerberos = libheimdal;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;