diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 26dccb1247cb..7d3c04e77dae 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,43 +1,43 @@
 # New ports collection makefile for: offlineimap
 # Date created:		08 Aug 2002
 # Whom:			nbm
 #
 # $FreeBSD$
 #
 
 PORTNAME=	offlineimap
-PORTVERSION=	3.99.18
-PORTREVISION=	1
+PORTVERSION=	4.0.0
 CATEGORIES=	mail python
 MASTER_SITES=	http://gopher.quux.org:70/devel/offlineimap/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	Powerful IMAP/Maildir synchronization and reader support
 
 RUN_DEPENDS=	${TKINTER}:${PORTSDIR}/x11-toolkits/py-tkinter
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 TKINTER=	${PYTHON_SITELIBDIR}/_tkinter.so
 
 MAN1=		offlineimap.1
-DOCS=		manual.html manual.pdf manual.ps manual.txt
+DOCS=		COPYRIGHT ChangeLog UPGRADING manual.html manual.pdf \
+		manual.ps manual.txt
 EXAMPLES=	offlineimap.conf offlineimap.conf.minimal
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${MANPREFIX}/man/man1/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 	@${SED} -e 's!%%EXAMPLESDIR%%!${EXAMPLESDIR}!' \
 		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index ed95b9aaa6c0..bded74c0b850 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1 +1 @@
-MD5 (offlineimap_3.99.18.tar.gz) = 8973ad4c343738f4b03fa11208dace75
+MD5 (offlineimap_4.0.0.tar.gz) = 13e355c8a957dddfe9b7486821d83370
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index da17a3b3bdd7..56fb6405a32d 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -1,109 +1,113 @@
+@comment $FreeBSD$
 bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Base.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/IMAP.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/LocalStatus.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/Maildir.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Base.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/IMAP.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/LocalStatus.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Blinkenlights.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Curses.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Noninteractive.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/TTY.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/TTY.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/TTY.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Tk.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Tk.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/Tk.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/UIBase.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
 %%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py
 %%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/accounts.py
 %%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/accounts.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/imaplib.py
 %%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/imaplib.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/imapserver.py
 %%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/imapserver.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/imaputil.py
 %%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/imaputil.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/init.py
 %%PYTHON_SITELIBDIR%%/offlineimap/init.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/init.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/localeval.py
 %%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/localeval.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/mbnames.py
 %%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/mbnames.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.py
 %%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/syncmaster.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/version.py
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/manual.ps
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/offlineimap.conf
 %%EXAMPLESDIR%%/offlineimap.conf.minimal
 @dirrm %%EXAMPLESDIR%%