diff --git a/mail/spamass-rules/Makefile b/mail/spamass-rules/Makefile
index fab485486486..a90871e43da0 100644
--- a/mail/spamass-rules/Makefile
+++ b/mail/spamass-rules/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for: spamass-rules
-# Date created:         20040725
-# Whom:                 mranner@inode.at
-#
 # $FreeBSD$
-#
 
 PORTNAME=	spamass-rules
-PORTVERSION=	20120319
+PORTVERSION=	20120817
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ranner.eu/stuff/
 
@@ -15,23 +10,52 @@ COMMENT=	Custom rulesets for SpamAssassin
 
 RUN_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 
-OPTIONS=	AHBL "Check AHBL Blacklist" on \
-		AIRMAX "Some custom rulesets" off \
-		BACKHAIR "Catch those ugly, unsightly HTML tags" off \
-		BOGUS_VIRUS "Catch 'collateral spam' caused by viruses" on \
-		CHICKENPOX "Catch spam like 'l.ooks f|or th.is garb+age'" off \
-		CHINESE "Catches spam written in Chinese" off \
-		EVILNUMBERS "Phone numbers, PO boxes, ... from spam " off \
-		GERMAN "Catches spam written in German" on \
-		GREEK "Catches spam written in Greek" on \
-		MALWARE "Malware Patrol - Block List" on \
-		MANGLED "Looks for obfuscated/gappy words" off \
-		MIMEVLD "Some mime validation rules" on \
-		NIXSPAM "Check NiX Spam Blacklist" on \
-		RANDOM "Detects spamware mistakes like: %RANDOM_WORD" on \
-		TRIPWIRE "Matches 3 chars that shouldn't be together" on \
-		WEEDS "Looks at alphanum, hex, lower-, uppercase chars" off \
-		WEEDS2 "More restrictive than WEEDS, dont use together" on
+NO_OPTIONS_SORT=	yes
+OPTIONS_DEFINE=	\
+	AHBL \
+	AIRMAX \
+	BACKHAIR \
+	BOGUS_VIRUS \
+	CHICKENPOX \
+	CHINESE \
+	DBRACKETS \
+	EVILNUMBERS \
+	GERMAN \
+	GREEK \
+	MALWARE \
+	MANGLED \
+	MIMEVLD \
+	MSPIKE \
+	NIXSPAM \
+	RANDOM \
+	TRIPWIRE \
+	WEEDS
+
+OPTIONS_SINGLE=		WEEDS
+OPTIONS_SINGLE_WEEDS=	WEEDS1 WEEDS2
+OPTIONS_DEFAULT=	BOGUS_VIRUS DBRACKETS GERMAN GREEK MALWARE MIMEVLD MSPIKE NIXSPAM RANDOM TRIPWIRE WEEDS WEEDS2
+
+AHBL_DESC=		Check AHBL Blacklist
+AIRMAX_DESC=	Some custom rulesets
+BACKHAIR_DESC=	Catch those ugly, unsightly HTML tags
+BOGUS_VIRUS_DESC=	Catch 'collateral spam' caused by viruses
+CHICKENPOX_DESC=	Catch spam like 'l.ooks f|or th.is garb+age'
+CHINESE_DESC=	Catches spam written in Chinese
+DBRACKETS_DESC=		Double-brackets around To header address
+EVILNUMBERS_DESC=	Phone numbers, PO boxes, ... from spam
+GERMAN_DESC=	Catches spam written in German
+GREEK_DESC=		Catches spam written in Greek
+MALWARE_DESC=	Malware Patrol - Block List
+MANGLED_DESC=	Looks for obfuscated/gappy words
+MIMEVLD_DESC=	Some mime validation rules
+MSPIKE_DESC=	Check mailspike.net blacklist
+NIXSPAM_DESC=	Check NiX Spam blacklist
+RANDOM_DESC=	Detects spamware mistakes like: %RANDOM_WORD
+TRIPWIRE_DESC=	Matches 3 chars that shouldn't be together
+WEEDS_DESC=		Looks at alphanum, hex, lower-, uppercase chars
+WEEDS1_DESC=	Less restrictive rules
+WEEDS2_DESC=	More restrictive rules
+
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -40,78 +64,88 @@ SPAMASS_FILES=
 USE_BZIP2=	yes
 INSTALL_DIR=	${PREFIX}/${SPAMASS_CONF}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_AHBL)
+.if ${PORT_OPTIONS:MAHBL}
 SPAMASS_FILES+=	20_dnsbl_ahbl.cf
 .endif
 
-.if !defined(WITHOUT_AIRMAX)
+.if ${PORT_OPTIONS:MAIRMAX}
 SPAMASS_FILES+=	airmax.cf
 .endif
 
-.if !defined(WITHOUT_BACKHAIR)
+.if ${PORT_OPTIONS:MBACKHAIR}
 SPAMASS_FILES+=	backhair.cf
 .endif
 
-.if !defined(WITHOUT_BOGUS_VIRUS)
+.if ${PORT_OPTIONS:MBOGUS_VIRUS}
 SPAMASS_FILES+=	bogus-virus-warnings.cf
 .endif
 
-.if !defined(WITHOUT_CHICKENPOX)
+.if ${PORT_OPTIONS:MCHICKENPOX}
 SPAMASS_FILES+=	chickenpox.cf
 .endif
 
-.if defined(WITH_CHINESE)
+.if ${PORT_OPTIONS:MCHINESE}
 SPAMASS_FILES+=	chinese_rules.cf
 .endif
 
-.if !defined(WITHOUT_EVILNUMBERS)
+.if ${PORT_OPTIONS:MDBRACKETS}
+SPAMASS_FILES+=	99_SMF_BRACKETS_TO.cf
+.endif
+
+.if ${PORT_OPTIONS:MEVILNUMBERS}
 SPAMASS_FILES+=	evilnumbers.cf
 .endif
 
-.if !defined(WITHOUT_GERMAN)
+.if ${PORT_OPTIONS:MGERMAN}
 SPAMASS_FILES+=	70_zmi_german.cf
 .endif
 
-.if !defined(WITHOUT_GREEK)
+.if ${PORT_OPTIONS:MGREEK}
 SPAMASS_FILES+=	gr_domain.cf
 .endif
 
-.if !defined(WITHOUT_MALWARE)
+.if ${PORT_OPTIONS:MMALWARE}
 SPAMASS_FILES+=	malwarepatrol.cf
 .endif
 
-.if !defined(WITHOUT_MANGLED)
+.if ${PORT_OPTIONS:MMANGLED}
 SPAMASS_FILES+=	mangled.cf
 .endif
 
-.if !defined(WITHOUT_MIMEVLD)
+.if ${PORT_OPTIONS:MMIMEVLD}
 SPAMASS_FILES+=	mime_validate.cf
 .endif
 
-.if !defined(WITHOUT_NIXSPAM)
+.if ${PORT_OPTIONS:MMSPIKE}
+SPAMASS_FILES+=	10_dnsbl_mspike.cf
+.endif
+
+.if ${PORT_OPTIONS:MNIXSPAM}
 SPAMASS_FILES+=	20_dnsbl_nixspam.cf
 .endif
 
-.if !defined(WITHOUT_RANDOM)
+.if ${PORT_OPTIONS:MRANDOM}
 SPAMASS_FILES+=	random.cf
 .endif
 
-.if !defined(WITHOUT_TRIPWIRE)
+.if ${PORT_OPTIONS:MTRIPWIRE}
 SPAMASS_FILES+=	99_FVGT_Tripwire.cf
 .endif
 
-.if defined(WITH_WEEDS) && defined(WITHOUT_WEEDS2)
+.if ${PORT_OPTIONS:MWEEDS}
 SPAMASS_FILES+=	weeds.cf
 .endif
 
-.if !defined(WITHOUT_WEEDS2) && !defined(WITH_WEEDS)
+.if ${PORT_OPTIONS:MWEEDS2}
 SPAMASS_FILES+=	weeds2.cf
 .endif
 
 PLIST_FILES=	${SPAMASS_FILES:S/^/${SPAMASS_CONF}\//}
 
+.include <bsd.port.pre.mk>
+
 do-build:
 	@${DO_NADA}
 
diff --git a/mail/spamass-rules/distinfo b/mail/spamass-rules/distinfo
index 28188f27ed5e..2a7ae659261e 100644
--- a/mail/spamass-rules/distinfo
+++ b/mail/spamass-rules/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spamass-rules-20120319.tar.bz2) = 3a41a55634214d012f213c8110a3885ac165e0db90d4ea11a9a6fcc84bf4acfa
-SIZE (spamass-rules-20120319.tar.bz2) = 465252
+SHA256 (spamass-rules-20120817.tar.bz2) = 4734532ae0220ea5755cfb4a28e8733866b050c598b214841ceb6efd6245ab97
+SIZE (spamass-rules-20120817.tar.bz2) = 318330