diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 8db7786d4bd..13b993878a6 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -1,12 +1,13 @@
-# $OpenBSD: Makefile,v 1.7 2006/06/03 12:48:56 steven Exp $
+# $OpenBSD: Makefile,v 1.8 2007/02/11 11:25:51 fkr Exp $
 
 COMMENT=	"powerful IMAP/Maildir synchronization and reader support"
 
-DISTNAME=	offlineimap_4.0.11
+V=             4.0.16                                                                                                
+DISTNAME=      offlineimap_${V} 
 CATEGORIES=	mail
-PKGNAME=        ${DISTNAME:S/_/-/}p0
+PKGNAME=        ${DISTNAME:S/_/-/}
 
-HOMEPAGE=	http://www.quux.org/devel/offlineimap/
+HOMEPAGE=	http://software.complete.org/offlineimap/
 
 MAINTAINER=	Laurence Tratt <laurie@tratt.net>
 
@@ -16,7 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${HOMEPAGE}
+MASTER_SITES=	${HOMEPAGE}static/download_area/${V}/
 
 NO_REGRESS=	Yes
 
diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo
index 2623306b809..ff4a2151ed3 100644
--- a/mail/offlineimap/distinfo
+++ b/mail/offlineimap/distinfo
@@ -1,4 +1,4 @@
-MD5 (offlineimap_4.0.11.tar.gz) = 41af0924d5e19480377616f4b1d059e1
-RMD160 (offlineimap_4.0.11.tar.gz) = 66beaaaf166a0742ab590f32418d13dd3de87c37
-SHA1 (offlineimap_4.0.11.tar.gz) = e9ace080fe5b5b993d79c76ef7d1bbafa1c55cca
-SIZE (offlineimap_4.0.11.tar.gz) = 218773
+MD5 (offlineimap_4.0.16.tar.gz) = 3de813eec9afa373006ac5cad7299389
+RMD160 (offlineimap_4.0.16.tar.gz) = 0182994bab7a244c45d59c5cdbd620451c21f29c
+SHA1 (offlineimap_4.0.16.tar.gz) = fcbd16b1838d3dde328b939de2256b9480216e43
+SIZE (offlineimap_4.0.16.tar.gz) = 174917