diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index e877935d6958..74f23b9e893b 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,29 +1,36 @@
 # New ports collection makefile for: offlineimap
 # Date created:		08 Aug 2002
 # Whom:			nbm
 #
 # $FreeBSD$
 #
 
 PORTNAME=	offlineimap
-PORTVERSION=	3.2.6
+PORTVERSION=	3.99.0
 CATEGORIES=	mail
 MASTER_SITES=	http://gopher.quux.org:70/devel/offlineimap/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	nbm@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 MAN1=		offlineimap.1
+DOCS=		manual.html manual.pdf manual.ps manual.txt
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/offlineimap.py ${PREFIX}/bin/offlineimap
 	${INSTALL_MAN} ${WRKSRC}/offlineimap.1 ${MANPREFIX}/man/man1/
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/offlineimap.conf ${EXAMPLESDIR}
+	@${SED} -e 's!__EXAMPLESDIR__!${EXAMPLESDIR}!' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index 82f86fcbeead..e7f16f0cfd40 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1 +1 @@
-MD5 (offlineimap_3.2.6.tar.gz) = bf62e533c4b4f9ced8948eabbc1a413c
+MD5 (offlineimap_3.99.0.tar.gz) = 39cb7e0bfddda13f2ef68dd3ca5054f1
diff --git a/mail/offlineimap/files/patch-offlineimap.py b/mail/offlineimap/files/patch-offlineimap.py
deleted file mode 100644
index 7416592aed99..000000000000
--- a/mail/offlineimap/files/patch-offlineimap.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- offlineimap.py.orig	Thu Aug  8 10:31:46 2002
-+++ offlineimap.py	Thu Aug  8 10:32:33 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.2
-+#!/usr/bin/env python2.2
- 
- # Copyright (C) 2002 John Goerzen
- # <jgoerzen@complete.org>
diff --git a/mail/offlineimap/files/patch-setup.py b/mail/offlineimap/files/patch-setup.py
deleted file mode 100644
index ac4bee6d5d8f..000000000000
--- a/mail/offlineimap/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	Thu Aug  8 10:57:56 2002
-+++ setup.py	Thu Aug  8 10:58:04 2002
-@@ -34,7 +34,6 @@
-       url = offlineimap.version.homepage,
-       packages = ['offlineimap', 'offlineimap.folder',
-                   'offlineimap.repository', 'offlineimap.ui'],
--      scripts = ['offlineimap.py'],
-       license = offlineimap.version.copyright + \
-                 ", Licensed under the GPL version 2"
- )
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index 1125c1108d70..53be2777427d 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -1,79 +1,90 @@
 bin/offlineimap
 %%PYTHON_SITELIBDIR%%/offlineimap/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/__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/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/folder/__init__.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/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
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.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/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/__init__.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.py
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/ui/detector.pyo
 %%PYTHON_SITELIBDIR%%/offlineimap/version.py
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyc
 %%PYTHON_SITELIBDIR%%/offlineimap/version.pyo
+%%PORTDOCS%%share/doc/offlineimap/manual.html
+%%PORTDOCS%%share/doc/offlineimap/manual.pdf
+%%PORTDOCS%%share/doc/offlineimap/manual.ps
+%%PORTDOCS%%share/doc/offlineimap/manual.txt
 share/examples/offlineimap/offlineimap.conf
 @dirrm share/examples/offlineimap
+%%PORTDOCS%%@dirrm share/doc/offlineimap
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
 @dirrm %%PYTHON_SITELIBDIR%%/offlineimap