diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 19d7b7f89455..25b6e0099aca 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/05/09 07:37:10 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/05/30 15:28:06 schmonz Exp $
 
 
-DISTNAME=	offlineimap-6.5.5
-DISTFILES=	v6.5.5.tar.gz
+DISTNAME=	offlineimap-6.5.6
+DISTFILES=	v6.5.6.tar.gz
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/OfflineIMAP/offlineimap/archive/
 
diff --git a/mail/offlineimap/PLIST b/mail/offlineimap/PLIST
index ae5ec6c4ffd3..eff503952162 100644
--- a/mail/offlineimap/PLIST
+++ b/mail/offlineimap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/04/23 16:11:31 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/05/30 15:28:06 schmonz Exp $
 bin/offlineimap
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/offlineimap/CustomConfig.py
@@ -22,6 +22,9 @@ ${PYSITELIB}/offlineimap/folder/Base.pyo
 ${PYSITELIB}/offlineimap/folder/Gmail.py
 ${PYSITELIB}/offlineimap/folder/Gmail.pyc
 ${PYSITELIB}/offlineimap/folder/Gmail.pyo
+${PYSITELIB}/offlineimap/folder/GmailMaildir.py
+${PYSITELIB}/offlineimap/folder/GmailMaildir.pyc
+${PYSITELIB}/offlineimap/folder/GmailMaildir.pyo
 ${PYSITELIB}/offlineimap/folder/IMAP.py
 ${PYSITELIB}/offlineimap/folder/IMAP.pyc
 ${PYSITELIB}/offlineimap/folder/IMAP.pyo
@@ -70,6 +73,9 @@ ${PYSITELIB}/offlineimap/repository/Base.pyo
 ${PYSITELIB}/offlineimap/repository/Gmail.py
 ${PYSITELIB}/offlineimap/repository/Gmail.pyc
 ${PYSITELIB}/offlineimap/repository/Gmail.pyo
+${PYSITELIB}/offlineimap/repository/GmailMaildir.py
+${PYSITELIB}/offlineimap/repository/GmailMaildir.pyc
+${PYSITELIB}/offlineimap/repository/GmailMaildir.pyo
 ${PYSITELIB}/offlineimap/repository/IMAP.py
 ${PYSITELIB}/offlineimap/repository/IMAP.pyc
 ${PYSITELIB}/offlineimap/repository/IMAP.pyo
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index a7c44db40578..f712ea7462ca 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2014/04/23 16:11:31 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2014/05/30 15:28:06 schmonz Exp $
 
-SHA1 (v6.5.5.tar.gz) = 8cf4b1dfe98f14d51d8e331dd7393accc9320ac7
-RMD160 (v6.5.5.tar.gz) = 56408076074d8a38d8edbfd8fe4995d6ccbb30fe
-Size (v6.5.5.tar.gz) = 175348 bytes
+SHA1 (v6.5.6.tar.gz) = cced67060be2922ca3ce056839b2aa1fe6b776a1
+RMD160 (v6.5.6.tar.gz) = 1957addafe7e3362b232457cc59a178ca770d400
+Size (v6.5.6.tar.gz) = 187803 bytes
+SHA1 (patch-offlineimap_____init____.py) = 417defa34b36f61fae7db467c9c949fa595a908a
diff --git a/mail/offlineimap/patches/patch-offlineimap_____init____.py b/mail/offlineimap/patches/patch-offlineimap_____init____.py
new file mode 100644
index 000000000000..48597605848a
--- /dev/null
+++ b/mail/offlineimap/patches/patch-offlineimap_____init____.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-offlineimap_____init____.py,v 1.1 2014/05/30 15:28:06 schmonz Exp $
+
+Bump version (missed by upstream).
+
+--- offlineimap/__init__.py.orig	2014-05-23 17:50:46.000000000 +0000
++++ offlineimap/__init__.py
+@@ -1,7 +1,7 @@
+ __all__ = ['OfflineImap']
+ 
+ __productname__ = 'OfflineIMAP'
+-__version__     = "6.5.5"
++__version__     = "6.5.6"
+ __copyright__   = "Copyright 2002-2013 John Goerzen & contributors"
+ __author__      = "John Goerzen"
+ __author_email__= "john@complete.org"