diff --git a/ChangeLog b/ChangeLog
index 4dea772e63..0cd7a75ee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb  2 14:05:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/debug.rb: Documentation for DEBUGGER__ class methods based on
+	  patch by Vincent Batts [ruby-core:51253]
+
 Sat Feb  2 13:37:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/net/smtp.rb: Fix rdoc title for Net::SMTP
diff --git a/lib/debug.rb b/lib/debug.rb
index 0cf81c0885..40886b14a6 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -891,22 +891,34 @@ EOHELP
   @stdout = STDOUT
 
   class << DEBUGGER__
+    # Returns the IO used as stdout. Defaults to STDOUT
     def stdout
       @stdout
     end
 
+    # Sets the IO used as stdout. Defaults to STDOUT
     def stdout=(s)
       @stdout = s
     end
 
+    # Returns the display expression list
+    #
+    # See DEBUGGER__ for more usage
     def display
       @display
     end
 
+    # Returns the list of break points where execution will be stopped.
+    #
+    # See DEBUGGER__ for more useage
     def break_points
       @break_points
     end
 
+    # Returns the list of waiting threads.
+    #
+    # When stepping through the traces of a function, thread gets suspended, to
+    # be resumed later.
     def waiting
       @waiting
     end