diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp
index f872da8c..3b0ece22 100644
--- a/src/shell/shell.cpp
+++ b/src/shell/shell.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell.cpp,v 1.87 2007-08-12 19:16:09 qbix79 Exp $ */
+/* $Id: shell.cpp,v 1.88 2007-08-17 17:58:46 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <stdarg.h>
@@ -440,6 +440,7 @@ void SHELL_Init() {
 	MSG_Add("SHELL_CMD_CHDIR_ERROR","Unable to change to: %s.\n");
 	MSG_Add("SHELL_CMD_CHDIR_HINT","To change to different drive type \033[31m%c:\033[0m\n");
 	MSG_Add("SHELL_CMD_CHDIR_HINT_2","directoryname is longer than 8 charachters and/or contains spaces.\nTry \033[31mcd %s\033[0m\n");
+	MSG_Add("SHELL_CMD_CHDIR_HINT_3","You are still on drive Z:, change to a mounted drive with \033[31mC:\033[0m.\n");
 	MSG_Add("SHELL_CMD_MKDIR_ERROR","Unable to make: %s.\n");
 	MSG_Add("SHELL_CMD_RMDIR_ERROR","Unable to remove: %s.\n");
 	MSG_Add("SHELL_CMD_DEL_ERROR","Unable to delete: %s.\n");
diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp
index c9f04f5c..0574bfae 100644
--- a/src/shell/shell_cmds.cpp
+++ b/src/shell/shell_cmds.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell_cmds.cpp,v 1.77 2007-08-12 19:16:09 qbix79 Exp $ */
+/* $Id: shell_cmds.cpp,v 1.78 2007-08-17 17:58:46 qbix79 Exp $ */
 
 #include <string.h>
 #include <ctype.h>
@@ -284,7 +284,12 @@ void DOS_Shell::CMD_CHDIR(char * args) {
 			strcat(temp,"~1");
 			WriteOut(MSG_Get("SHELL_CMD_CHDIR_HINT_2"),temp);
 		} else {
-			WriteOut(MSG_Get("SHELL_CMD_CHDIR_ERROR"),args);
+			Bit8u drive=DOS_GetDefaultDrive()+'A';
+			if (drive=='Z') {
+				WriteOut(MSG_Get("SHELL_CMD_CHDIR_HINT_3"));
+			} else {
+				WriteOut(MSG_Get("SHELL_CMD_CHDIR_ERROR"),args);
+			}
 		}
 	}
 };