diff -urN bash.orig/bashrc bash/bashrc
--- bash.orig/bashrc	2015-07-06 18:02:36.265648306 +0200
+++ bash/bashrc	2015-07-06 18:16:14.341521461 +0200
@@ -36,19 +36,6 @@
 # the history will halt the shell prompt until it's finished.
 #PROMPT_COMMAND='history -a'
 
-# Change the window title of X terminals 
-case ${TERM} in
-	xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
-		PS1='\[\033]0;\u@\h:\w\007\]'
-		;;
-	screen*)
-		PS1='\[\033k\u@\h:\w\033\\\]'
-		;;
-	*)
-		unset PS1
-		;;
-esac
-
 use_color=false
 
 # Set colorful PS1 only on colorful terminals.
@@ -76,9 +63,9 @@
 	fi
 
 	if [[ ${EUID} == 0 ]] ; then
-		PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
+		PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
 	else
-		PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+		PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
 	fi
 
 	alias ls='ls --color=auto'
@@ -88,9 +75,9 @@
 else
 	if [[ ${EUID} == 0 ]] ; then
 		# show root@ when we don't have colors
-		PS1+='\u@\h \W \$ '
+		PS1='\u@\h \W \$ '
 	else
-		PS1+='\u@\h \w \$ '
+		PS1='\u@\h \w \$ '
 	fi
 fi
 
diff -urN bash.orig/bashrc.d/00window-title.sh bash/bashrc.d/00window-title.sh
--- bash.orig/bashrc.d/00window-title.sh	1970-01-01 02:00:00.000000000 +0200
+++ bash/bashrc.d/00window-title.sh	2015-07-06 19:07:00.804733738 +0200
@@ -0,0 +1,9 @@
+# Change the window title of X terminals
+case ${TERM} in
+	xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
+		PS1='\[\033]0;\u@\h:\w\007\]'"$PS1"
+		;;
+	screen*)
+		PS1='\[\033k\u@\h:\w\033\\\]'"$PS1"
+		;;
+esac