diff --git a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
index eb692e877..44744714d 100644
--- a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
@@ -147,16 +147,31 @@
rspamd.phishing.openphish_enabledcheckbox
+ Openphish is a service where phishing URLs get collected and asked by rspamd.
+
+
+ rspamd.phishing.openphish_map
+
+ text
+ Set the URL of the Openphish map file.rspamd.phishing.openphish_premium_enabledcheckbox
+ Openphish Premium offers more services, please only activate if you have a current license.rspamd.phishing.phishtank_enabledcheckbox
+ Enable Phishtank collaborative clearing house for data and information about phishing on the Internet.
+
+
+ rspamd.phishing.phishtank_map
+
+ text
+ Give a URL where to retrieve the Phishtank feed.
diff --git a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
index 88ef6d225..f26b91dcd 100644
--- a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
@@ -126,6 +126,10 @@
0Y
+
+
+ N
+ 0Y
@@ -134,6 +138,10 @@
0Y
+
+
+ N
+
diff --git a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf
index e40fe63fa..f7be9383f 100644
--- a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf
+++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf
@@ -3,7 +3,11 @@
#
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.phishing') %}
openphish_enabled = {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_enabled') and OPNsense.Rspamd.phishing.openphish_enabled == '1' %}true{% else %}false{% endif %};
+ {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_map') and OPNsense.Rspamd.phishing.openphish_map != '' %}openphish_map = "{{ OPNsense.Rspamd.phishing.openphish_map }}";{% endif %}
+
openphish_premium = {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_premium_enabled') and OPNsense.Rspamd.phishing.openphish_premium_enabled == '1' %}true{% else %}false{% endif %};
# Disabled by default
phishtank_enabled = {% if helpers.exists('OPNsense.Rspamd.phishing.phishtank_enabled') and OPNsense.Rspamd.phishing.phishtank_enabled == '1' %}true{% else %}false{% endif %};
+ {% if helpers.exists('OPNsense.Rspamd.phishing.phishtank_map') and OPNsense.Rspamd.phishing.phishtank_map != '' %}phishtank_map = "{{ OPNsense.Rspamd.phishing.phishtank_map }}";{% endif %}
+
{% endif %}