diff --git a/src/calibre/rpdb.py b/src/calibre/rpdb.py
index 9f823c06a1..1ba8c11cd4 100644
--- a/src/calibre/rpdb.py
+++ b/src/calibre/rpdb.py
@@ -114,6 +114,10 @@ def cli(port=4444):
     except IOError:
         pass
     atexit.register(readline.write_history_file, histfile)
+    p = pdb.Pdb()
+    readline.set_completer(p.complete)
+    readline.parse_and_bind("tab: complete")
+
     try:
         while True:
             recvd = b''