diff --git a/artiq/frontend/artiq_rpctool.py b/artiq/frontend/artiq_rpctool.py
index a97c5bb70..a26d70cf7 100755
--- a/artiq/frontend/artiq_rpctool.py
+++ b/artiq/frontend/artiq_rpctool.py
@@ -39,6 +39,7 @@ def list_methods(remote):
     doc = remote.get_rpc_method_list()
     if doc["docstring"] is not None:
         print(doc["docstring"])
+        print()
     for name, (argspec, docstring) in sorted(doc["methods"].items()):
         args = ""
         for arg in argspec["args"]:
diff --git a/artiq/protocols/pc_rpc.py b/artiq/protocols/pc_rpc.py
index 918c26c17..d50c13591 100644
--- a/artiq/protocols/pc_rpc.py
+++ b/artiq/protocols/pc_rpc.py
@@ -443,7 +443,7 @@ class Server(_AsyncioServer):
                     if obj["action"] == "get_rpc_method_list":
                         members = inspect.getmembers(target, inspect.ismethod)
                         doc = {
-                            "docstring": target.__doc__,
+                            "docstring": inspect.getdoc(target),
                             "methods": {}
                         }
                         for name, method in members: