diff --git a/byobu-janitor b/byobu-janitor
index 781a6471..2842685c 100755
--- a/byobu-janitor
+++ b/byobu-janitor
@@ -34,7 +34,10 @@ DEFAULT_PROFILE="light"
 PROFILE="$HOME/.$PKG/profile"
 
 # Establish ssh-agent socket, helps when reconnecting to a detached session
-[ -r "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ] && ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
+if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
+	rm -f "$RUN/$PKG.ssh-agent"
+	ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
+fi
 
 # Affects: users who launched using sudo, such that their config dir
 # is not writable by them
diff --git a/byobu-launcher b/byobu-launcher
index 341bbb9b..fb833002 100755
--- a/byobu-launcher
+++ b/byobu-launcher
@@ -33,7 +33,10 @@ else
 	# Set window title
 	printf "\033]0;${USER}@$(hostname) - ${PKG}\007"
 	# Update ssh-agent socket
-	[ -r "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ] &&  ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
+	if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then 
+		rm -f "$RUN/$PKG.ssh-agent"
+		ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
+	fi
 	# Re-attach to existing session
 	exec screen -xRR
 fi
diff --git a/debian/changelog b/debian/changelog
index 3b1d1664..f5a0ed54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ byobu (2.36) unreleased; urgency=low
 
   * bin/fan_speed: improve the logic for find the fan_speed system monitor
     LP: #439524
+  * byobu-launcher, byobu-janitor: sometimes the ssh socket link can become
+    a symlink to itself, causing byobu to fail to start due to too many
+    levels of symlinks; remove the link first, before creating it;
+    LP: #440221
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 30 Sep 2009 13:16:38 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 01 Oct 2009 21:43:41 -0500
 
 byobu (2.35-0ubuntu1) karmic; urgency=low