diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index 4f1f7e4c3274..5b39c8e23e66 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -1,87 +1,88 @@
 # New ports collection makefile for:	sid-milter
 # Date created:				18. Dec 2004
 # Whom:					dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sid-milter
 PORTVERSION=	0.2.14
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sid-milter
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An sid and spf milter for Sendmail
 
 RESTRICTED=	may incorporate intellectual property, possible patent issues
 
 WCONF=		${WRKSRC}/devtools/Site
 MAN8=		sid-filter.8
 DOCSFILES=	INSTALL KNOWNBUGS LICENSE README README-SenderID RELEASE_NOTES
 INSTALL_WRKSRC=	${WRKSRC}/sid-filter
 PLIST_FILES=	libexec/sid-filter
 PORTDOCS=	${DOCSFILES}
 
 .if defined(PARALLEL_PACKAGE_BUILD)
 IGNORE=	pointyhat cluster does not support sysvipc
 .endif
 
 SITE+=		${FILESDIR}/site.config.m4
 .if defined(WITH_SIDMILTER_AR)
 MAN3=		ar.3
 PLIST_FILES+=	include/libar.h lib/libar.a
 .endif
 .if defined(WITHOUT_RC_NG)
 PLIST_FILES+=	etc/rc.d/milter-sid.sh.sample
 .else
 USE_RC_SUBR=	milter-sid.sh
 .endif
 
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 .if defined(WITH_SENDMAIL_PORT)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 
 pre-configure:
 .if defined(WITHOUT_RC_NG)
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/milter-sid.sh \
 		> ${WRKSRC}/milter-sid.sh
 .endif
 	${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e "s|\`-O'|\`${CFLAGS}'|g" \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/devtools/OS/FreeBSD
 	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${SITE} > ${WCONF}/site.config.m4
 
 post-install:
 .if defined(WITHOUT_RC_NG)
 	${INSTALL_SCRIPT} ${WRKSRC}/milter-sid.sh \
 		${PREFIX}/etc/rc.d/milter-sid.sh.sample
 .endif
 .for i in ${MAN8}
 	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/
 .endfor
 .if defined(WITH_SIDMILTER_AR)
 	@(cd ${WRKSRC}/libar && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .for i in ${MAN3}
 	@${RM} -f ${MANPREFIX}/man/cat3/${i} ${MANPREFIX}/man/cat3/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man3/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/libar/ar.h ${PREFIX}/include/libar.h
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ${DOCSFILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/sid-milter/files/patch-sm-marid.c b/mail/sid-milter/files/patch-sm-marid.c
new file mode 100644
index 000000000000..db44f7896fb3
--- /dev/null
+++ b/mail/sid-milter/files/patch-sm-marid.c
@@ -0,0 +1,12 @@
+--- libmarid/sm-marid.c.bak	Tue Aug 17 04:50:54 2004
++++ libmarid/sm-marid.c	Sun Dec 17 17:37:36 2006
+@@ -22,7 +22,8 @@
+ char const * const
+ sm_marid_version_patterns_01[] = { "spf2.%d/pra%,%v", 	NULL };
+ char const * const
+-sm_marid_version_patterns_any[] = { "v=spf1", "spf2.%d/pra%,%v", NULL };
++sm_marid_version_patterns_any[] = { "v=spf1", "spf2.%d/pra%,%v", \
++				    "spf2.%d/mfrom,pra%,%v", NULL };
+ 
+ /*
+ **  MARID_DEFAULT_FREE -- default free callback if application passes NULL.