diff -u screenbin-1.3/debian/changelog screenbin-1.3/debian/changelog
--- screenbin-1.3/debian/changelog
+++ screenbin-1.3/debian/changelog
@@ -1,3 +1,12 @@
+screenbin (1.3-0ubuntu1.1) karmic-proposed; urgency=low
+
+  Cherry-pick upstream r28, which fixes support for Karmic EC2 guests
+  * screenbin: add support for karmic guests, which use byobu rather than
+    screen-profiles; increase the security slightly by execing the guest's
+    screen attachment; LP: #471917
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 10 Nov 2009 09:47:37 -0600
+
 screenbin (1.3-0ubuntu1) karmic; urgency=low
 
   * debian/control: depend on ec2-api-tools
only in patch2:
unchanged:
--- screenbin-1.3.orig/screenbin
+++ screenbin-1.3/screenbin
@@ -191,8 +191,8 @@
 	sudo /usr/bin/apt-get -q -y install $packages; \
 	mkdir -p ~/.screen-profiles; \
 	touch ~/.screen-profiles/windows; \
-	select-screen-profile -s ubuntu-light || select-screen-profiles -s light; \
-	/usr/share/screen-profiles/screen-launcher-install; \
+	select-screen-profile -s ubuntu-light || select-screen-profiles -s light || byobu-select-profile -s light; \
+	/usr/share/screen-profiles/screen-launcher-install || /usr/share/byobu/byobu-launcher-install; \
 "
 if [ "$READWRITE" = "1" ]; then
 	ssh -i $EC2_KEYPAIR "ubuntu@$hostname" "set -e; \
@@ -209,16 +209,16 @@
 	echo
 else
 	ssh -i $EC2_KEYPAIR "ubuntu@$hostname" "set -e; \
-		sudo chmod 6755 /usr/bin/screen.real; \
+		sudo chmod 6755 /usr/bin/screen.real || sudo chmod 6755 /usr/bin/screen; \
 		sudo chmod 755 /var/run/screen; \
 		printf \"aclumask guest+r guest-w guest-x\naclchg guest +r-w-x '#?'\naclchg guest +x 'prev,next,select,detach'\nmultiuser on\n\" > ~/.screenrc; \
 		sudo sed -i 's/PasswordAuthentication no//' /etc/ssh/sshd_config || true; \
-		printf \"PasswordAuthentication yes\nAllowTcpForwarding no\nMatch User guest\n  ForceCommand screen -x ubuntu/class\n\" | sudo tee -a /etc/ssh/sshd_config; \
+		printf \"PasswordAuthentication yes\nAllowTcpForwarding no\nMatch User guest\n  ForceCommand exec screen -x ubuntu/class\n\" | sudo tee -a /etc/ssh/sshd_config; \
 		sudo useradd -m -s /bin/bash -p $cryptpw $guest || true; \
 		sudo chown -R root:root /home/guest; \
 		sudo touch /home/guest/.screenrc; \
 		sudo /etc/init.d/ssh restart; \
-		screen -d -m -S class; \
+		byobu -c /usr/share/byobu/profiles/byoburc -d -m -S class || screen -d -m -S class; \
 	"
 	echo "Info: screen setup successfully!"
 	echo