--- sugar-0.99.0/bin/sugar.in.orig	2013-06-10 16:01:53.000000000 +0100
+++ sugar-0.99.0/bin/sugar.in	2013-06-28 09:08:58.634169909 +0100
@@ -38,6 +38,26 @@
 # Set Sugar's telepathy accounts directory
 export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts
 
+# Check if the keyring exists and create a default
+# unencrypted keyring (OLPC #10290)
+keyring_path=$HOME/.gnome2/keyrings
+if [ ! -e $keyring_path/login.keyring ] &&
+    [ ! -e $keyring_path/default.keyring ]; then
+    mkdir -p $keyring_path
+    echo 'default' > $keyring_path/default
+    TIME=$(/bin/date +%s)
+    cat >> $keyring_path/default.keyring.tmp <<EOF
+[keyring]
+display-name=default
+ctime=$TIME
+mtime=$TIME
+lock-on-idle=false
+lock-timeout=0
+EOF
+
+mv $keyring_path/default.keyring{.tmp,}
+fi
+
 # Source language settings and debug definitions
 if [ -f ~/.i18n ]; then
         . ~/.i18n