diff --git a/tools/llvm-db/CLIDebugger.h b/tools/llvm-db/CLIDebugger.h
index 046c2e8..e2dbaaf 100644
--- a/tools/llvm-db/CLIDebugger.h
+++ b/tools/llvm-db/CLIDebugger.h
@@ -184,16 +184,21 @@
     /// start executing the program.
     void startProgramRunning();
 
+    /// printSourceLine - Print the specified line of the current source file.
+    /// If the specified line is invalid (the source file could not be loaded or
+    /// the line number is out of range), don't print anything, but return true.
+    bool printSourceLine(unsigned LineNo);
+
     /// parseLineSpec - Parses a line specifier, for use by the 'list' command.
     /// If SourceFile is returned as a void pointer, then it was not specified.
     /// If the line specifier is invalid, an exception is thrown.
     void parseLineSpec(std::string &LineSpec, const SourceFile *&SourceFile,
                        unsigned &LineNo);
 
-    /// printSourceLine - Print the specified line of the current source file.
-    /// If the specified line is invalid (the source file could not be loaded or
-    /// the line number is out of range), don't print anything, but return true.
-    bool printSourceLine(unsigned LineNo);
+    /// parseProgramOptions - This method parses the Options string and loads it
+    /// as options to be passed to the program.  This is used by the run command
+    /// and by 'set args'.
+    void parseProgramOptions(std::string &Options);
   };
 }
 
diff --git a/tools/llvm-db/Commands.cpp b/tools/llvm-db/Commands.cpp
index 9d0bcba..cd1797c 100644
--- a/tools/llvm-db/Commands.cpp
+++ b/tools/llvm-db/Commands.cpp
@@ -191,7 +191,22 @@
   // And parse normally.
   return getUnsignedIntegerOption(Msg, Val, isOnlyOption);
 }
-                                                 
+
+
+/// parseProgramOptions - This method parses the Options string and loads it
+/// as options to be passed to the program.  This is used by the run command
+/// and by 'set args'.
+void CLIDebugger::parseProgramOptions(std::string &Options) {
+  // FIXME: tokenizing by whitespace is clearly incorrect.  Instead we should
+  // honor quotes and other things that a shell would.  Also in the future we
+  // should support redirection of standard IO.
+ 
+  std::vector<std::string> Arguments;
+  for (std::string A = getToken(Options); !A.empty(); A = getToken(Options))
+    Arguments.push_back(A);
+  Dbg.setProgramArguments(Arguments.begin(), Arguments.end());
+}
+                                                
 
 //===----------------------------------------------------------------------===//
 //                   Program startup and shutdown options
@@ -227,7 +242,7 @@
     assert(Dbg.isProgramLoaded() &&
            "loadProgram succeeded, but not program loaded!");
     TheProgramInfo = new ProgramInfo(Dbg.getProgram());
-    std::cout << "success loading '" << Dbg.getProgramPath() << "'!\n";
+    std::cout << "successfully loaded '" << Dbg.getProgramPath() << "'!\n";
   }
 }
 
@@ -276,12 +291,15 @@
 //===----------------------------------------------------------------------===//
 
 void CLIDebugger::runCommand(std::string &Options) {
-  if (!getToken(Options).empty()) throw "run arguments not supported yet.";
   if (!Dbg.isProgramLoaded()) throw "No program loaded.";
   if (Dbg.isProgramRunning() &&
       !askYesNo("The program is already running.  Restart from the beginning?"))
     return;
 
+  // Parse all of the options to the run command, which specify program
+  // arguments to run with.
+  parseProgramOptions(Options);
+
   eliminateRunInfo();
 
   // Start the program running.
@@ -455,6 +473,24 @@
 //===----------------------------------------------------------------------===//
 
 void CLIDebugger::breakCommand(std::string &Options) {
+  // Figure out where the user wants a breakpoint.
+  const SourceFile *File;
+  unsigned LineNo;
+  
+  // Check to see if the user specified a line specifier.
+  std::string Option = getToken(Options);  // strip whitespace
+  if (!Option.empty()) {
+    Options = Option + Options;  // reconstruct string
+
+    // Parse the line specifier.
+    parseLineSpec(FirstLineSpec, File, LineNo);
+  } else {
+    // Build a line specifier for the current stack frame.
+    throw "FIXME: breaking at the current location is not implemented yet!";
+  }
+  
+  
+  
   throw "breakpoints not implemented yet!";
 }
 
@@ -628,7 +664,7 @@
         assert(Tok == "-");
         StartLine = LineListedStart-ListSize;
         EndLine = LineListedStart;
-        if ((int)StartLine < 0) StartLine = 1;
+        if ((int)StartLine <= 0) StartLine = 1;
       }
     } else {
       // Must be a normal line specifier.
@@ -640,7 +676,7 @@
       // ListSize lines centered at the specified line.
       if (File != 0) CurrentFile = File;
       StartLine = LineNo - (ListSize+1)/2;
-      if ((int)StartLine < 0) StartLine = 1;
+      if ((int)StartLine <= 0) StartLine = 1;
       EndLine = StartLine + ListSize;
     }
 
@@ -705,7 +741,9 @@
 
   if (What.empty())
     throw "set command expects at least two arguments.";
-  if (What == "language") {
+  if (What == "args") {
+    parseProgramOptions(Options);
+  } else if (What == "language") {
     std::string Lang = getToken(Options);
     if (!getToken(Options).empty())
       throw "set language expects one argument at most.";
@@ -746,7 +784,17 @@
   if (What.empty() || !getToken(Options).empty())
     throw "show command expects one argument.";
 
-  if (What == "language") {
+  if (What == "args") {
+    std::cout << "Argument list to give program when started is \"";
+    // FIXME: This doesn't print stuff correctly if the arguments have spaces in
+    // them, but currently the only way to get that is to use the --args command
+    // line argument.  This should really handle escaping all hard characters as
+    // needed.
+    for (unsigned i = 0, e = Dbg.getNumProgramArguments(); i != e; ++i)
+      std::cout << (i ? " " : "") << Dbg.getProgramArgument(i);
+    std::cout << "\"\n";
+
+  } else if (What == "language") {
     std::cout << "The current source language is '";
     if (CurrentLanguage)
       std::cout << CurrentLanguage->getSourceLanguageName();