diff --git a/doc/rapi.rst b/doc/rapi.rst
index 2172b4a4d000e1d29793dd8b850f51d1a47b0c42..4c1763d6f218bbcd3144f58f8dff9e87ff094fde 100644
--- a/doc/rapi.rst
+++ b/doc/rapi.rst
@@ -136,6 +136,11 @@ Usage examples
 You can access the API using your favorite programming language as long
 as it supports network connections.
 
+Ganeti RAPI client
+++++++++++++++++++
+
+Ganeti includes a standalone RAPI client, ``lib/rapi/client.py``.
+
 Shell
 +++++
 
diff --git a/lib/rapi/client.py b/lib/rapi/client.py
index f9a80c1d40d54224d21ff1c6c4424a339f115ee4..97d89e003e76420c353ef9e0a642e8e615e5a0d9 100644
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@ -21,6 +21,9 @@
 
 """Ganeti RAPI client."""
 
+# No Ganeti-specific modules should be imported. The RAPI client is supposed to
+# be standalone.
+
 import httplib
 import urllib2
 import logging