diff --git a/src/bin/bash/builtins/cd.def b/src/bin/bash/builtins/cd.def
index 1c58c7c160..3c5c2af2f6 100644
--- a/src/bin/bash/builtins/cd.def
+++ b/src/bin/bash/builtins/cd.def
@@ -398,7 +398,8 @@ change_to_directory (newdir, nolinks)
      resolved path doesn't exist), fail immediately. */
   if (posixly_correct && nolinks == 0 && canon_failed)
     {
-      errno = ENOENT;
+      if (errno != ENOENT)
+	errno = ENOTDIR;
       return (0);
     }