diff --git a/input.c b/input.c
index 28129c911..8ae473112 100644
--- a/input.c
+++ b/input.c
@@ -1270,7 +1270,14 @@ static void add_emacs_bindings()
 	add_escaped_mapping( L"emacs", (L"\\C-h"), L"Control-h", L"backward-delete-char" );
 	add_escaped_mapping( L"emacs", (L"\\C-e"), L"Control-e", L"end-of-line" );
 	add_escaped_mapping( L"emacs", (L"\\C-w"), L"Control-w", L"backward-kill-word" );
+	add_escaped_mapping( L"emacs", (L"\\C-p"), L"Control-p", L"history-search-backward" );
+	add_escaped_mapping( L"emacs", (L"\\C-n"), L"Control-n", L"history-search-forward" );
+	add_escaped_mapping( L"emacs", (L"\\C-f"), L"Control-f", L"forward-char" );
+	add_escaped_mapping( L"emacs", (L"\\C-b"), L"Control-b", L"backward-char" );
 	add_escaped_mapping( L"emacs", (L"\e\x7f"), L"Alt-backspace", L"backward-kill-word" );
+	add_escaped_mapping( L"emacs", (L"\eb"), L"Alt-b", L"backward-word" );
+	add_escaped_mapping( L"emacs", (L"\ef"), L"Alt-f", L"forward-word" );
+	add_escaped_mapping( L"emacs", (L"\ed"), L"Alt-d", L"forward-kill-word" );
 	add_terminfo_mapping( L"emacs", (key_ppage), L"Page Up", L"beginning-of-history" );
 	add_terminfo_mapping( L"emacs", (key_npage), L"Page Down", L"end-of-history" );
 }