diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index c6f3c54306a0..3f399932d3ff 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -6,12 +6,14 @@ DISTVERSION=	1.0.0-p5
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf.org/files/src/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mnag/${PORTNAME}
+		LOCAL/mnag/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sender Policy Framework (SPF) library and client
 
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 MAKE_JOBS_UNSAFE=yes
 
 GNU_CONFIGURE=	yes
@@ -41,6 +43,9 @@ CONFIGURE_ARGS+=	--enable-logfile-stats
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+post-extract:
+	@${CHMOD} u+w ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/libspf/pkg-plist b/mail/libspf/pkg-plist
index cfaef8e9f54a..615bf71923e9 100644
--- a/mail/libspf/pkg-plist
+++ b/mail/libspf/pkg-plist
@@ -39,19 +39,6 @@ lib/libspf.so
 %%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-1.0.0-RC5.diff
 %%DATADIR%%/patches/qmail/1.05/netqmail-1.05-libspf-1.0.0-RC6.diff
 %%DATADIR%%/patches/qmail/README
-@dirrm %%DATADIR%%/patches/qmail/1.05
-@dirrm %%DATADIR%%/patches/qmail/1.03
-@dirrm %%DATADIR%%/patches/qmail
-@dirrm %%DATADIR%%/patches/Sendmail/8.13.x
-@dirrm %%DATADIR%%/patches/Sendmail/8.12.x
-@dirrm %%DATADIR%%/patches/Sendmail
-@dirrm %%DATADIR%%/patches/Postfix/2.1.x
-@dirrm %%DATADIR%%/patches/Postfix
-@dirrm %%DATADIR%%/patches/Courier-MTA
-@dirrm %%DATADIR%%/patches
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/qmail/control
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/qmail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/Sendmail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dir %%DOCSDIR%%/docs/qmail/1.04
+%%PORTDOCS%%@dir %%DOCSDIR%%/docs/qmail/1.03
+%%PORTDOCS%%@dir %%DOCSDIR%%/docs/Postfix/2.1.x