diff --git a/debian/changelog b/debian/changelog
index 97c82ca..43cf824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ lubuntu-default-settings (0.23) UNRELEASED; urgency=low
    - Add a custom configuration file for xscreensaver, with blank mode by
      default (LP: #578789).
    - Don't append /etc/xdg in xdg path, already done by Xsession.d
+   - Start gnome-keyring support for ssh before the session. Thanks urusha for
+     the patch (LP: #664206).
 
  -- Julien Lavergne <gilir@ubuntu.com>  Tue, 15 Nov 2011 13:47:32 +0700
 
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index 959bc5c..d6c3a37 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -65,5 +65,11 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
        eval "$(dbus-launch --sh-syntax --exit-with-session)"
 fi
 
+# Export Gnome-keyring variables if needed
+# See bug #664206
+if which gnome-keyring-daemon >/dev/null; then
+       export $(/usr/bin/gnome-keyring-daemon --start --components=ssh)
+fi
+
 # Start the LXDE session
 exec /usr/bin/lxsession -s Lubuntu -e LXDE
diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook
index 3abb8e8..2025855 100644
--- a/usr/bin/startlubuntu-netbook
+++ b/usr/bin/startlubuntu-netbook
@@ -65,5 +65,11 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
        eval "$(dbus-launch --sh-syntax --exit-with-session)"
 fi
 
+# Export Gnome-keyring variables if needed
+# See bug #664206
+if which gnome-keyring-daemon >/dev/null; then
+       export $(/usr/bin/gnome-keyring-daemon --start --components=ssh)
+fi
+
 # Start the LXDE session
 exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE