diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 2bb7de1cae..c5d6b78686 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -188,19 +188,21 @@ namespace OpenSim.Framework.Console
         {
             lock (m_modulesCommands)
             {
-                if (m_modulesCommands.ContainsKey(moduleName))
+                foreach (string key in m_modulesCommands.Keys)
                 {
-                    List<CommandInfo> commands = m_modulesCommands[moduleName];
-                    var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help));
-                    ourHelpText.Sort();
-                    helpText.AddRange(ourHelpText);
+                    // Allow topic help requests to succeed whether they are upper or lowercase.
+                    if (moduleName.ToLower() == key.ToLower())
+                    {
+                        List<CommandInfo> commands = m_modulesCommands[key];
+                        var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help));
+                        ourHelpText.Sort();
+                        helpText.AddRange(ourHelpText);
 
-                    return true;
-                }
-                else
-                {
-                    return false;
+                        return true;
+                    }
                 }
+
+                return false;
             }
         }
 
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 484159ce15..5de3f25b7d 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -248,15 +248,16 @@ namespace OpenSim
                 {
                     string capitalizedTopic = char.ToUpper(topic[0]) + topic.Substring(1);
 
+                    // This is a hack to allow the user to enter the help command in upper or lowercase.  This will go
+                    // away at some point.
+                    m_console.Commands.AddCommand(capitalizedTopic, false, "help " + topic,
+                                                  "help " + capitalizedTopic,
+                                                  "Get help on plugin command '" + topic + "'",
+                                                  HandleCommanderHelp);
                     m_console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
                                                   "help " + capitalizedTopic,
                                                   "Get help on plugin command '" + topic + "'",
                                                   HandleCommanderHelp);
-//
-//                    m_console.Commands.AddCommand("General", false, topic,
-//                                                  topic,
-//                                                  "Execute subcommand for plugin '" + topic + "'",
-//                                                  null);
 
                     ICommander commander = null;