diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 6262f3db693..b5af16db5d1 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.73 2011/06/23 17:32:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.74 2011/07/01 06:39:17 giovanni Exp $
 
 COMMENT=		mailfilter to identify and mark spam
 
 VER=			3.3.2
 DISTNAME=		Mail-SpamAssassin-${VER}
 PKGNAME=		p5-${DISTNAME:S/-rc/rc/}
+REVISION=		0
 RULESNAME=		Mail-SpamAssassin-rules-${VER}-r1104058.tar.gz
 CATEGORIES=		mail perl5
 
@@ -65,6 +66,7 @@ DOCS=		README UPGRADE LICENSE procmailrc.example \
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/SpamAssassin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/SpamAssassin/sql
 	${INSTALL_DATA_DIR} ${SAMPLE_CONFDIR}
 	${SUBST_CMD} -c ${FILESDIR}/${FAQ} ${WRKSRC}/${FAQ}
 	pod2man --section=1 ${WRKSRC}/spamc/spamc.pod > \
@@ -74,6 +76,7 @@ post-install:
 .for i in ${FAQ} ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/SpamAssassin
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/sql/* ${PREFIX}/share/doc/SpamAssassin/sql
 	cd ${PREFIX}/share/spamassassin; tar xzf ${FULLDISTDIR}/${RULESNAME}
 	chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/spamassassin/*
 
diff --git a/mail/p5-Mail-SpamAssassin/pkg/PLIST b/mail/p5-Mail-SpamAssassin/pkg/PLIST
index 1c94a49c96a..fbe60125559 100644
--- a/mail/p5-Mail-SpamAssassin/pkg/PLIST
+++ b/mail/p5-Mail-SpamAssassin/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.30 2011/06/23 17:32:46 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.31 2011/07/01 06:39:17 giovanni Exp $
 @pkgpath mail/p5-Mail-SpamAssassin
 @newgroup _spamdaemon:506
 @newuser _spamdaemon:506:506:daemon:SpamAssassin:${LOCALSTATEDIR}:/sbin/nologin
@@ -200,6 +200,16 @@ share/doc/SpamAssassin/procmailrc.example
 share/doc/SpamAssassin/sample-nonspam.txt
 share/doc/SpamAssassin/sample-spam.txt
 @sample ${CONFDIR}/
+share/doc/SpamAssassin/sql/
+share/doc/SpamAssassin/sql/README
+share/doc/SpamAssassin/sql/README.awl
+share/doc/SpamAssassin/sql/README.bayes
+share/doc/SpamAssassin/sql/awl_mysql.sql
+share/doc/SpamAssassin/sql/awl_pg.sql
+share/doc/SpamAssassin/sql/bayes_mysql.sql
+share/doc/SpamAssassin/sql/bayes_pg.sql
+share/doc/SpamAssassin/sql/userpref_mysql.sql
+share/doc/SpamAssassin/sql/userpref_pg.sql
 share/examples/SpamAssassin/
 share/examples/SpamAssassin/init.pre
 @sample ${CONFDIR}/init.pre