diff --git a/debian/changelog b/debian/changelog
index a9e1082e..1df09c60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 byobu (2.66) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/bin/byobu, usr/bin/byobu-janitor: ensure that the SSH_AUTH_SOCK
+    link is not circular, LP: #549091
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 16 Mar 2010 23:27:30 -0500
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index fa555396..5183fa08 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -45,7 +45,7 @@ grep -qs "^[^#]" "$HOME/.$PKG/windows" && DEFAULT_WINDOW= || DEFAULT_WINDOW="mot
 [ -x /usr/bin/tput ] && [ $(/usr/bin/tput colors) -eq 256 ] && SCREEN_TERM="-T screen-256color"
 
 # Create or update ssh-agent socket
-if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
+if [ -S "$SSH_AUTH_SOCK" ] && [ ! -h "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
 	rm -f "$RUN/$PKG.ssh-agent"
 	ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
 fi
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 11444c38..6841c190 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -35,7 +35,7 @@ DEFAULT_PROFILE="light"
 PROFILE="$HOME/.$PKG/profile"
 
 # Establish ssh-agent socket, helps when reconnecting to a detached session
-if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
+if [ -S "$SSH_AUTH_SOCK" ] && [ ! -h "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
 	rm -f "$RUN/$PKG.ssh-agent"
 	ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
 fi