diff --git a/docs/gallium/debugging.rst b/docs/gallium/debugging.rst
index 34dedff542c..053b0cccf74 100644
--- a/docs/gallium/debugging.rst
+++ b/docs/gallium/debugging.rst
@@ -21,10 +21,6 @@ This option controls if the debug variables should be printed to stderr. This
 is probably the most useful variable, since it allows you to find which
 variables a driver uses.
 
-.. envvar:: GALLIUM_RBUG <bool> (false)
-
-Controls if the :ref:`rbug` should be used.
-
 .. envvar:: GALLIUM_TRACE <string> ("")
 
 If set, this variable will cause the :ref:`trace` output to be written to the
@@ -104,15 +100,3 @@ The variables of type "flags" all take a string with comma-separated flags to
 enable different debugging for different parts of the drivers or state
 tracker. If set to "help", the driver will print a list of flags which the
 variable accepts. Order does not matter.
-
-
-.. _rbug:
-
-Remote Debugger
-^^^^^^^^^^^^^^^
-
-The remote debugger, commonly known as rbug, allows for runtime inspections of
-:ref:`Context`, :ref:`Screen`, :ref:`Resource` and :ref:`Shader` objects; and
-pausing and stepping of :ref:`Draw` calls. Is used with rbug-gui which is
-hosted outside of the main mesa repository. rbug is can be used over a network
-connection, so the debugger does not need to be on the same machine.
diff --git a/docs/gallium/distro.rst b/docs/gallium/distro.rst
index d36c1234b2b..e8b03c0a979 100644
--- a/docs/gallium/distro.rst
+++ b/docs/gallium/distro.rst
@@ -73,11 +73,6 @@ Trace
 Wrapper driver. Trace dumps an XML record of the calls made to the
 :ref:`Context` and :ref:`Screen` objects that it wraps.
 
-Rbug
-^^^^
-
-Wrapper driver. :ref:`rbug` driver used with stand alone rbug-gui.
-
 Gallium frontends
 -----------------
 
diff --git a/docs/sourcetree.rst b/docs/sourcetree.rst
index da59b7d209e..2a4019ca305 100644
--- a/docs/sourcetree.rst
+++ b/docs/sourcetree.rst
@@ -116,7 +116,6 @@ each directory.
             shaders. Incomplete.
          -  **hud** - Heads-Up Display, an overlay showing GPU statistics
          -  **pipebuffer** - utility module for managing buffers
-         -  **rbug** - Gallium remote debug utility
          -  **rtasm** - run-time assembly/machine code generation.
             Currently there's run-time code generation for x86/SSE,
             PowerPC and Cell SPU.