diff --git a/AUTHORS b/AUTHORS
index 291ddc51b..570ba41ef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,3 +41,5 @@ Thanks to the following, who submitted detailed bug reports and excellent sugges
   Ian Mortimer
   Zach Frazier
   Joe Pulliam
+  Juergen Daubert
+
diff --git a/ChangeLog b/ChangeLog
index 8dff14de3..851f36d47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
  + Fixed bug that was causing the 'completed' report to sort incorrectly.
  + Added feature to allow the user to quit when asked to confirm multiple
    changes.  Now task asks "Proceed with change? (Yes/no/all/quit)".
+ + Fixed bug #321 where all shell input was converted to lower case (thanks
+   to Juergen Daubert).
 
 ------ old releases ------------------------------
 
diff --git a/src/command.cpp b/src/command.cpp
index 7dad0ebbe..4dab68b67 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1178,11 +1178,11 @@ void handleShell ()
 
     command = "";
     std::getline (std::cin, command);
-    command = lowerCase (trim (command));
+    command = trim (command);
 
-    if (command.length () > 0               &&
-        command.length () <= quit.length () &&
-        command == quit.substr (0, command.length ()))
+    if (command.length ()   >  0              &&
+        command.length ()   <= quit.length () &&
+        lowerCase (command) == quit.substr (0, command.length ()))
     {
       keepGoing = false;
     }