diff --git a/lldb/scripts/Python/interface/SBBreakpoint.i b/lldb/scripts/Python/interface/SBBreakpoint.i
index 0ca83bf33cdd..9e333c372873 100644
--- a/lldb/scripts/Python/interface/SBBreakpoint.i
+++ b/lldb/scripts/Python/interface/SBBreakpoint.i
@@ -128,9 +128,19 @@ public:
     uint32_t
     GetIgnoreCount () const;
     
+    %feature("docstring", "
+    //--------------------------------------------------------------------------
+    /// The breakpoint stops only if the condition expression evaluates to true.
+    //--------------------------------------------------------------------------
+    ") SetCondition;
     void 
     SetCondition (const char *condition);
     
+    %feature("docstring", "
+    //------------------------------------------------------------------
+    /// Get the condition expression for the breakpoint.
+    //------------------------------------------------------------------
+    ") GetCondition;
     const char *
     GetCondition ();
 
diff --git a/lldb/scripts/Python/interface/SBBreakpointLocation.i b/lldb/scripts/Python/interface/SBBreakpointLocation.i
index d41033f2fea4..093a0e6d380d 100644
--- a/lldb/scripts/Python/interface/SBBreakpointLocation.i
+++ b/lldb/scripts/Python/interface/SBBreakpointLocation.i
@@ -50,9 +50,20 @@ public:
     void
     SetIgnoreCount (uint32_t n);
 
+    %feature("docstring", "
+    //--------------------------------------------------------------------------
+    /// The breakpoint location stops only if the condition expression evaluates
+    /// to true.
+    //--------------------------------------------------------------------------
+    ") SetCondition;
     void 
     SetCondition (const char *condition);
     
+    %feature("docstring", "
+    //------------------------------------------------------------------
+    /// Get the condition expression for the breakpoint location.
+    //------------------------------------------------------------------
+    ") GetCondition;
     const char *
     GetCondition ();
 
diff --git a/lldb/scripts/Python/interface/SBWatchpoint.i b/lldb/scripts/Python/interface/SBWatchpoint.i
index 75259310271f..47177c740f70 100644
--- a/lldb/scripts/Python/interface/SBWatchpoint.i
+++ b/lldb/scripts/Python/interface/SBWatchpoint.i
@@ -66,9 +66,19 @@ public:
     void
     SetIgnoreCount (uint32_t n);
 
+    %feature("docstring", "
+    //------------------------------------------------------------------
+    /// Get the condition expression for the watchpoint.
+    //------------------------------------------------------------------
+    ") GetCondition;
     const char *
     GetCondition ();
 
+    %feature("docstring", "
+    //--------------------------------------------------------------------------
+    /// The watchpoint stops only if the condition expression evaluates to true.
+    //--------------------------------------------------------------------------
+    ") SetCondition;
     void 
     SetCondition (const char *condition);