diff --git a/recipes-core/base-files/base-files/profile b/recipes-core/base-files/base-files/profile
index f773369..cfd8393 100644
--- a/recipes-core/base-files/base-files/profile
+++ b/recipes-core/base-files/base-files/profile
@@ -9,6 +9,7 @@ TERM="xterm-256color"
 
 # Set the prompt for bash and ash (no other shells known to be in use here)
 PS1='\u@\h:\W\$ '
+PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
 
 if [ -d /etc/profile.d ]; then
 	for i in /etc/profile.d/*.sh; do
diff --git a/recipes-core/readline/readline/inputrc b/recipes-core/readline/readline/inputrc
new file mode 100644
index 0000000..883686c
--- /dev/null
+++ b/recipes-core/readline/readline/inputrc
@@ -0,0 +1,42 @@
+# do not bell on tab-completion
+#set bell-style none
+
+set meta-flag on
+set input-meta on
+set convert-meta off
+set output-meta on
+
+# Completed names which are symbolic links to
+# directories have a slash appended.
+set mark-symlinked-directories on
+
+$if mode=emacs
+
+# for linux console and RH/Debian xterm
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+# commented out keymappings for pgup/pgdown to reach begin/end of history
+#"\e[5~": beginning-of-history
+#"\e[6~": end-of-history
+"\e[5~": history-search-backward
+"\e[6~": history-search-forward
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+
+# for rxvt
+"\e[8~": end-of-line
+"\eOc": forward-word
+"\eOd": backward-word
+
+# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for freebsd console
+"\e[H": beginning-of-line
+"\e[F": end-of-line
+$endif
diff --git a/recipes-core/readline/readline_%.bbappend b/recipes-core/readline/readline_%.bbappend
new file mode 100644
index 0000000..8b7518b
--- /dev/null
+++ b/recipes-core/readline/readline_%.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://inputrc"
+
+do_install_append() {
+	cp ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
+}