diff --git a/debian/changelog b/debian/changelog
index 2fe528f9..04d4ebe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 byobu (5.38) unreleased; urgency=low
 
+  [ Dustin Kirkland ]
   * usr/bin/byobu-janitor: LP: #1173620
     - there is no "grey" in tmux
   * usr/bin/byobu-launch:
@@ -17,6 +18,10 @@ byobu (5.38) unreleased; urgency=low
   * usr/bin/byobu: LP: #1176956
     - handle unlimted ulimits
 
+  [ Reinhard Tartler ]
+  * usr/bin/byobu-reconnect-sockets, usr/lib/byobu/include/shutil: LP: #1162432
+    - fix reconnect on zsh
+
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 21 Apr 2013 11:11:01 -0500
 
 byobu (5.37-0ubuntu1) raring; urgency=low
diff --git a/usr/bin/byobu-reconnect-sockets b/usr/bin/byobu-reconnect-sockets
index 048b6ac5..9d909fd3 100755
--- a/usr/bin/byobu-reconnect-sockets
+++ b/usr/bin/byobu-reconnect-sockets
@@ -93,7 +93,7 @@ case $BYOBU_BACKEND in
 esac
 
 # Establish gpg-agent socket, helps when reconnecting to a detached session
-newest "$HOME/.gnupg/"gpg-agent-info-* && . "$_RET" && export_and_send GPG_AGENT_INFO
+newest "$HOME/.gnupg/gpg-agent-info-*" && . "$_RET" && export_and_send GPG_AGENT_INFO
 
 # Reconnect dbus, source the most recently touched session-bus
 # Sorry, ls -t is needed here, to sort by time
diff --git a/usr/lib/byobu/include/shutil b/usr/lib/byobu/include/shutil
index 73e84b16..5aa9ca69 100755
--- a/usr/lib/byobu/include/shutil
+++ b/usr/lib/byobu/include/shutil
@@ -52,37 +52,37 @@ color_screen() {
 
 color_map() {
 	case "$1" in
-		k) _RET="black" ;;
-		r) _RET="red" ;;
-		g) _RET="green" ;;
-		y) _RET="yellow" ;;
-		b) _RET="blue" ;;
-		m) _RET="magenta" ;;
-		c) _RET="cyan" ;;
-		w) _RET="white" ;;
-		d) _RET="color0" ;;
-		K) _RET="#555555" ;;
-		R) _RET="#FF0000" ;;
-		G) _RET="#00FF00" ;;
-		Y) _RET="#FFFF00" ;;
-		B) _RET="#0000FF" ;;
-		M) _RET="#FF00FF" ;;
-		C) _RET="#00FFFF" ;;
-		W) _RET="#FFFFFF" ;;
+		"k") _RET="black" ;;
+		"r") _RET="red" ;;
+		"g") _RET="green" ;;
+		"y") _RET="yellow" ;;
+		"b") _RET="blue" ;;
+		"m") _RET="magenta" ;;
+		"c") _RET="cyan" ;;
+		"w") _RET="white" ;;
+		"d") _RET="color0" ;;
+		"K") _RET="#555555" ;;
+		"R") _RET="#FF0000" ;;
+		"G") _RET="#00FF00" ;;
+		"Y") _RET="#FFFF00" ;;
+		"B") _RET="#0000FF" ;;
+		"M") _RET="#FF00FF" ;;
+		"C") _RET="#00FFFF" ;;
+		"W") _RET="#FFFFFF" ;;
 		*) _RET= ;;
 	esac
 }
 
 attr_map() {
 	case "$1" in
-		d) _RET=,dim ;;
-		u) _RET=,underscore ;;
-		b) _RET=,bold ;;
-		r) _RET=,reverse ;;
-		s) _RET=,standout ;;
-		B) _RET=,blinking ;;
-		h) _RET=,hidden ;;
-		i) _RET=,italics ;;
+		"d") _RET=,dim ;;
+		"u") _RET=,underscore ;;
+		"b") _RET=,bold ;;
+		"r") _RET=,reverse ;;
+		"s") _RET=,standout ;;
+		"B") _RET=,blinking ;;
+		"h") _RET=,hidden ;;
+		"i") _RET=,italics ;;
 		*) _RET= ;;
 	esac
 }