diff --git a/tools/llvm-db/CLIDebugger.cpp b/tools/llvm-db/CLIDebugger.cpp
index 75798d2..4e36bbf 100644
--- a/tools/llvm-db/CLIDebugger.cpp
+++ b/tools/llvm-db/CLIDebugger.cpp
@@ -125,7 +125,10 @@
   //
   addCommand("info", new BuiltinCLICommand(
     "Generic command for showing things about the program being debugged",
-    "FIXME: document\n",
+    "info functions: display information about functions in the program.\ninfo"
+    " source : display information about the current source file.\ninfo source"
+    "s : Display source file names for the program\ninfo target : print status"
+    " of inferior process\n",
     &CLIDebugger::infoCommand));
 
   addCommand("list", C = new BuiltinCLICommand(
diff --git a/tools/llvm-db/Commands.cpp b/tools/llvm-db/Commands.cpp
index 6df2f69..8e3125e 100644
--- a/tools/llvm-db/Commands.cpp
+++ b/tools/llvm-db/Commands.cpp
@@ -505,8 +505,11 @@
 void CLIDebugger::infoCommand(std::string &Options) {
   std::string What = getToken(Options);
 
-  if (What.empty() || !getToken(Options).empty())
-    throw "info command expects exactly one argument.";
+  if (What.empty() || !getToken(Options).empty()){
+    std::string infoStr("info");
+    helpCommand(infoStr);
+    return;
+  }
 
   if (What == "frame") {
   } else if (What == "functions") {