diff --git a/bin/hostname b/bin/hostname
new file mode 100755
index 00000000..cb211bef
--- /dev/null
+++ b/bin/hostname
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+#    hostname - report a host's name
+#    Copyright (C) 2008 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+hostname | sed 's/\..*$//'
diff --git a/bin/whoami b/bin/whoami
new file mode 100755
index 00000000..dfe89b00
--- /dev/null
+++ b/bin/whoami
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+#    hostname - report a host's name
+#    Copyright (C) 2008 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+whoami
diff --git a/debian/changelog b/debian/changelog
index 47773373..baf07918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-screen-profiles (1.26) UNRELEASED; urgency=low
+screen-profiles (1.26-0ubuntu1) jaunty; urgency=low
 
-  * 
+  Fixes for LP: #331648
+  * bin/whoami: report user logged in
+  * bin/hostname: report hostname
+  * profiles/common, debian/install: add whoami, hostname
+  * profiles/profile.skel: append user@host to the far right of window bar
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 19 Feb 2009 10:35:09 -0600
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 19 Feb 2009 10:52:18 -0600
 
 screen-profiles (1.25-0ubuntu1) jaunty; urgency=low
 
diff --git a/debian/install b/debian/install
index 5def767b..d6cd8c1a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,12 +1,14 @@
 bin/cpu-count usr/share/screen-profiles/bin
 bin/cpu-freq usr/share/screen-profiles/bin
 bin/ec2-cost usr/share/screen-profiles/bin
+bin/hostname usr/share/screen-profiles/bin
 bin/load-average usr/share/screen-profiles/bin
 bin/mem-available usr/share/screen-profiles/bin
 bin/mem-used usr/share/screen-profiles/bin
 bin/reboot-required usr/share/screen-profiles/bin
 bin/release usr/share/screen-profiles/bin
 bin/updates-available usr/share/screen-profiles/bin
+bin/whoami usr/share/screen-profiles/bin
 profiles/common usr/share/screen-profiles/profiles
 profiles/plain usr/share/screen-profiles/profiles
 profiles/ubuntu-light usr/share/screen-profiles/profiles
diff --git a/profiles/common b/profiles/common
index 0dd3f8e4..0ba356cc 100644
--- a/profiles/common
+++ b/profiles/common
@@ -34,6 +34,8 @@ backtick 105 3600 3600 /usr/share/screen-profiles/bin/mem-available
 backtick 106 2 2 /usr/share/screen-profiles/bin/load-average
 backtick 107 2 2 /usr/share/screen-profiles/bin/mem-used
 backtick 108 600 600 /usr/share/screen-profiles/bin/ec2-cost
+backtick 109 3600 3600 /usr/share/screen-profiles/bin/hostname
+backtick 110 3600 3600 /usr/share/screen-profiles/bin/whoami
 
 hardstatus alwayslastline
 
diff --git a/profiles/profile.skel b/profiles/profile.skel
index 2d447a14..b8b3a2ec 100644
--- a/profiles/profile.skel
+++ b/profiles/profile.skel
@@ -22,7 +22,7 @@
 source /usr/share/screen-profiles/profiles/common
 
 # Window tabs, second to last line
-caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%?"
+caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%? %= %{=b Wk}%110`@%109`"
 
 # Status string, last line
 hardstatus string '__LOGO__%{=b Wk} %100` %{= Wk} %= %{=b bW}%102`%{= Wk} %{=b rW}%101`%{= Wk} %{= Wg}%108`%{= Wk} %{= Yk}%106`%{= Wk} %{= Wk}%104`%{=b cW}%103`%{= Wk} %{=b gW}%105`,%107`%{= Wk} %Y-%m-%d %0c:%s'