diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index 473c018c8e3b..a0d82a621c35 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	archivemail
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Archive or delete mail older than N days
 
 USE_PYTHON=	yes
diff --git a/mail/archivemail/files/patch-archivemail b/mail/archivemail/files/patch-archivemail
new file mode 100644
index 000000000000..3e7cb9f45850
--- /dev/null
+++ b/mail/archivemail/files/patch-archivemail
@@ -0,0 +1,11 @@
+--- archivemail.orgi	2009-01-31 21:50:02.000000000 +0100
++++ archivemail	2009-01-31 21:50:22.000000000 +0100
+@@ -1271,7 +1271,7 @@
+         original = mailbox.MHMailbox(mailbox_name)
+     else:
+         unexpected_error("unknown type: %s" % type)        
+-    assert(original)
++
+ 
+     cache = IdentityCache(mailbox_name)
+