diff --git a/emacs/.emacs.d/site-lisp/jabber-init.el b/emacs/.emacs.d/site-lisp/jabber-init.el
index 3d63694..936a905 100644
--- a/emacs/.emacs.d/site-lisp/jabber-init.el
+++ b/emacs/.emacs.d/site-lisp/jabber-init.el
@@ -31,15 +31,10 @@ Insert PROPOSED-ALERT in the buffer if it is non-nil."
   "Use stumpwm to echo a message has arrived."
   (oni:stumpwm-echo title))
 
-(setq jabber-account-list
-      (append (mapcar (lambda (str) (list (concat str "/" system-name)))
-                      '("tom@ryuslash.org" "ryuslash@ninthfloor.org"))
-              '("ryuslash@gmail.com"
-                (:network-server . "talk.google.com")
-                (:port . 443)
-                (:connection-type . ssl)))
+(setq jabber-account-list `((,(concat "tom@ryuslash.org/" system-name)
+                             (:connection-type . starttls))))
 
-      jabber-avatar-cache-directory     "~/.emacs.d/jabber-avatars/"
+(setq jabber-avatar-cache-directory     "~/.emacs.d/jabber-avatars/"
       jabber-chat-buffer-format         "+%n"
       jabber-chat-foreign-prompt-format "%t %u"
       jabber-chat-local-prompt-format   "%t %u"