diff --git a/tipbot/command_manager.py b/tipbot/command_manager.py
index 986d351..e5f5a58 100644
--- a/tipbot/command_manager.py
+++ b/tipbot/command_manager.py
@@ -63,7 +63,10 @@ def Commands(nick,chan,cmd):
 
   module_name = GetParam(cmd,1)
 
-  SendTo(nick, "Commands for %s:" % config.tipbot_name)
+  if module_name:
+    SendTo(nick, "Commands for %s's %s module:" % (config.tipbot_name,module_name))
+  else:
+    SendTo(nick, "Commands for %s (!commands <modulename> for command help):" % config.tipbot_name)
 
   msgs = dict()
   for command_name in commands: