diff --git a/Changes b/Changes
index b252ddbd4..0bfa13ddd 100644
--- a/Changes
+++ b/Changes
@@ -497,3 +497,5 @@
 - OperOverride INVITE notices are now also global (if you have the eyes snomask set) (#2212).
 - Module coders: New function: sendto_snomask_global().
 - Speedup sendto_snomask/sendto_connectnotice/sendto_fconnectnotice code.
+- spamfilter.conf: fixed mIRC exploit sigs
+- Fixed all spamfilters in configfile not working due to configrewrite (post-3.2.2).
diff --git a/spamfilter.conf b/spamfilter.conf
index 18c4c53c8..c5652f970 100644
--- a/spamfilter.conf
+++ b/spamfilter.conf
@@ -14,17 +14,17 @@
  */
 
 spamfilter {
-	regex "(.+ ){20}";
-	target dcc;
+	regex "\x01DCC (SEND|RESUME)[ ]+\"(.+ ){20}";
+	target { private; channel; };
 	reason "mIRC 6.0-6.11 exploit attempt";
 	action kill;
 };
 
 spamfilter {
-	regex ".{225}";
-	target dcc;
-	reason "mIRC 6.12 exploit attempt";
-	action block;
+	regex "\x01DCC (SEND|RESUME).{225}";
+	target { private; channel; };
+	reason "Possible mIRC 6.12 exploit attempt";
+	action kill;
 };
 
 spamfilter {
diff --git a/src/s_conf.c b/src/s_conf.c
index 14e34a34e..10c4d679f 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -5380,7 +5380,7 @@ int _conf_spamfilter(ConfigFile *conf, ConfigEntry *ce)
 			else
 			{
 				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
-					target |= spamfilter_getconftargets(cep->ce_varname);
+					target |= spamfilter_getconftargets(cepp->ce_varname);
 			}
 		}
 		else if (!strcmp(cep->ce_varname, "action"))