diff --git a/.cvsignore b/.cvsignore
index 59aa4a7..b277155 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-offlineimap-6.0.3.tar.gz
+offlineimap-6.1.0.tar.gz
diff --git a/fix-socket.ssl-deprecation-on-python-2.6.patch b/fix-socket.ssl-deprecation-on-python-2.6.patch
new file mode 100644
index 0000000..5d77bc1
--- /dev/null
+++ b/fix-socket.ssl-deprecation-on-python-2.6.patch
@@ -0,0 +1,34 @@
+commit cc444fcc99d1521e4e4fa1fede27ea3c1c8ff4e2
+Author: Christoph Höger <choeger@cs.tu-berlin.de>
+Date:   Thu Jul 2 10:19:18 2009 +0200
+
+    fix socket.ssl deprecation on python 2.6
+    
+    Signed-off-by: Christoph Höger <choeger@cs.tu-berlin.de>
+
+diff --git a/offlineimap/imaplib2.py b/offlineimap/imaplib2.py
+index 2426754..658c369 100644
+--- a/offlineimap/imaplib2.py
++++ b/offlineimap/imaplib2.py
+@@ -35,6 +35,9 @@ __author__ = "Piers Lauder <piers@janeelix.com>"
+ 
+ import binascii, os, Queue, random, re, select, socket, sys, time, threading
+ 
++# python 2.6 has a new ssl module
++if sys.version_info >= (2,6): import ssl
++
+ select_module = select
+ 
+ #       Globals
+@@ -1664,7 +1667,10 @@ class IMAP4_SSL(IMAP4):
+         self.host = host is not None and host or ''
+         self.port = port is not None and port or IMAP4_SSL_PORT
+         self.sock = self.open_socket()
+-        self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
++        if sys.version_info < (2,6):
++            self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
++        else:
++            self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)
+ 
+         self.read_fd = self.sock.fileno()
+ 
diff --git a/offlineimap.spec b/offlineimap.spec
index d2a8a83..2f8b6eb 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           offlineimap
-Version:        6.0.3
-Release:        3%{?dist}
+Version:        6.1.0
+Release:        1%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
 License:        GPLv2+
@@ -16,6 +16,8 @@ BuildRequires:  docbook-utils
 
 BuildArch:      noarch
 
+Patch0:		fix-socket.ssl-deprecation-on-python-2.6.patch
+
 
 %description
 OfflineIMAP is a tool to simplify your e-mail reading. With OfflineIMAP,
@@ -30,7 +32,7 @@ not provide disconnected operation.
 
 %prep
 %setup -q -n %name-%version
-
+%patch0 -p1
 
 %build
 python setup.py build
@@ -61,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 02 2009 Christoph Höger <choeger@cs.tu-berlin.de> - 6.1.0-1
+- Update to latest version
+- Add a temporary patch for socket.ssl deprecation
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 64bd2cc..b27cc66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e425174c935dd5f112201305c9e0fc47  offlineimap-6.0.3.tar.gz
+3b1e41d475ef73909d64489b3b2494dd  offlineimap-6.1.0.tar.gz