diff --git a/support-d/.bashrc b/support-d/.bashrc
index 1ffb31635d..21082a4ef7 100644
--- a/support-d/.bashrc
+++ b/support-d/.bashrc
@@ -12,6 +12,8 @@ if [ ! -f ~/.inputrc ]; then
     export INPUTRC="/etc/inputrc"
 fi
 
+set -o emacs
+
 export LESSCHARSET="latin1"
 export LESS="-R"
 export CHARSET="ISO-8859-1"
diff --git a/support-d/.emacs b/support-d/.emacs
index 0f1c91f82d..9b7b191e8b 100644
--- a/support-d/.emacs
+++ b/support-d/.emacs
@@ -3,8 +3,6 @@
 
 ;;; You can either fine-tune the bells and whistles of this mode or
 ;;; bulk enable them by putting
-set -o emacs
-
 ;(setq cperl-hairy t)
 (global-unset-key "\C-h")
 (global-set-key "\C-h" 'delete-backward-char)