diff --git a/json-rpc-shell.c b/json-rpc-shell.c
index 82ad5ea..2ddb95c 100644
--- a/json-rpc-shell.c
+++ b/json-rpc-shell.c
@@ -688,6 +688,10 @@ input_el_start (struct input *input, const char *program_name)
 		"run-editor", "Run editor to edit line", input_el_on_run_editor);
 	el_set (self->editline, EL_BIND, "M-e", "run-editor",         NULL);
 
+	el_set (self->editline, EL_ADDFN,
+		"complete", "Complete word", input_el_on_complete);
+	el_set (self->editline, EL_BIND, "\t", "complete",            NULL);
+
 	el_set (self->editline, EL_ADDFN,
 		"newline-insert", "Insert a newline", input_el_on_newline_insert);
 	el_set (self->editline, EL_BIND, "M-\n", "newline-insert",    NULL);