diff --git a/security/maltrail/pkg-descr b/security/maltrail/pkg-descr
index 2d478fa23..2c9162e54 100644
--- a/security/maltrail/pkg-descr
+++ b/security/maltrail/pkg-descr
@@ -14,6 +14,7 @@ Changelog
1.1
* Add a note in General tab
+* Add whitelisting support
1.0
diff --git a/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml b/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml
index 01c848c11..93f644561 100644
--- a/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml
+++ b/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml
@@ -23,4 +23,12 @@
select_multiple
List of interface to listen on, none means listen on all interfaces.
+
+ general.whitelist
+
+ select_multiple
+
+ true
+ Here you can whitelist IP addresses or domains.
+
diff --git a/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml b/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml
index d094d2500..4fbcc3cca 100644
--- a/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml
+++ b/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml
@@ -19,5 +19,8 @@
Y
N
+
+ N
+
diff --git a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
index 02e11b9f6..e4e7308e7 100644
--- a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
+++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
@@ -38,6 +38,9 @@ USE_HEURISTICS true
USE_HEURISTICS false
{% endif %}
CHECK_MISSING_HOST false
+{% if helpers.exists('OPNsense.maltrail.general.whitelist') and OPNsense.maltrail.general.whitelist != '' %}
+USER_WHITELIST {{ OPNsense.maltrail.general.whitelist }}
+{% endif %}
CHECK_HOST_DOMAINS false
SHOW_DEBUG false
LOG_DIR /var/log/maltrail