diff --git a/byobu-launcher b/byobu-launcher
index d510b8df..c2dc1728 100755
--- a/byobu-launcher
+++ b/byobu-launcher
@@ -23,6 +23,7 @@
 
 # Ensure that the PROMPT_COMMAND gets printed, such that gnome-terminal
 # and friends can pick it up before going into screen
+export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD/$HOME/~}\007"'
 [ -x /bin/bash ] && echo | /bin/bash -i -s 2>/dev/null
 
 out=`screen -ls 2>/dev/null` || true
diff --git a/debian/changelog b/debian/changelog
index 474f7ccf..3a5a84a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 byobu (2.22) unreleased; urgency=low
 
-  * UNRELEASED
+  * byobu-launcher: must explicitly set PROMPT_COMMAND in byobu_launcher;
+    this used to be in /etc/skel/.bashrc, but has since been dropped
+    (see Debian Bug #420656); thus, we need to set it ourself if we
+    want gnome-terminal to be updated with the remote host/username
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 20 Jul 2009 15:37:02 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 22 Jul 2009 19:34:51 -0500
 
 byobu (2.21-0ubuntu1) karmic; urgency=low