diff --git a/data/conf/rspamd/custom/bad_words.map b/data/conf/rspamd/custom/bad_words.map
index 5f19d2a9..4f87db8b 100644
--- a/data/conf/rspamd/custom/bad_words.map
+++ b/data/conf/rspamd/custom/bad_words.map
@@ -1,9 +1,6 @@
-/\ssex\s/i
-/\svagina\s/i
 /\serotic\s/i
 /\serection\s/i
 /\ssexy\s/i
-/\spenis\s/i
 /\sass\s/i
 /\sviagra\s/i
 /\stits\s/i
@@ -17,28 +14,12 @@
 /\spharma\s/i
 /\spharmacy\s/i
 /\sseo\s/i
-/\smarketing\s/i
 /\sjackpot\s/i
-/\slotto\s/i
 /\slottery\s/i
-/pillenversand/i
-/\skredithilfe\s/i
-/\skapital\s/i
-/\skrankenversicherung\s/i
 /bitcoin/i
-/pädophil/i
-/paedophil/i
-/freiberufler/i
-/unternehmer/i
-/masturbieren/i
 /trojaner/i
 /malware/i
 /\sscooter\s/i
-/\sescooter\s/i
-/\se-scooter\s/i
 /testost/i
-/\spotenz\s/i
-/potenzmittel/i
-/rezeptfrei/i
-/apotheke/i
 /web\sdevelopment/i
+/\spenis\s/i
diff --git a/data/conf/rspamd/custom/bad_words_de.map b/data/conf/rspamd/custom/bad_words_de.map
new file mode 100644
index 00000000..238afc29
--- /dev/null
+++ b/data/conf/rspamd/custom/bad_words_de.map
@@ -0,0 +1,21 @@
+/\ssex\s/i
+/\svagina\s/i
+/\spenis\s/i
+/\smarketing\s/i
+/\slotto\s/i
+/pillenversand/i
+/\skredithilfe\s/i
+/\skapital\s/i
+/\skrankenversicherung\s/i
+/pädophil/i
+/paedophil/i
+/freiberufler/i
+/unternehmer/i
+/masturbieren/i
+/\sescooter\s/i
+/\se-scooter\s/i
+/testost/i
+/\spotenz\s/i
+/potenzmittel/i
+/rezeptfrei/i
+/apotheke/i
\ No newline at end of file
diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf
index 036737de..ffa51204 100644
--- a/data/conf/rspamd/local.d/composites.conf
+++ b/data/conf/rspamd/local.d/composites.conf
@@ -27,6 +27,6 @@ OLEFY_MACRO {
   policy = "remove_weight";
 }
 BAD_WORD_BAD_TLD {
-  expression = "FISHY_TLD & BAD_WORDS"
+  expression = "FISHY_TLD & ( BAD_WORDS | BAD_WORDS_DE )"
   score = 10.0;
 }