diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index f96250468..b559755f7 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -8,6 +8,21 @@ WWW: https://github.com/acmesh-official/acme.sh
 Plugin Changelog
 ================
 
+2.2
+
+Added:
+* add support for hexonet.com DNS API (#2134)
+
+Fixed:
+* fix DNS challenge alias mode (#2128, #2130)
+
+Changed:
+* BREAKING: use configured DNS sleep time for Namesilo instead of hardcoded value (#2121)
+* BREAKING: use configured DNS sleep time for Lexicon/Namesilo instead of hardcoded value
+* BREAKING: use configured DNS sleep time for Linode instead of hardcoded value
+* BREAKING: use configured DNS sleep time for Linode v4 instead of hardcoded value
+* BREAKING: use configured DNS sleep time for Netcup instead of hardcoded value
+
 2.1
 
 Added:
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
index 7866682af..e6999e3a9 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
@@ -603,6 +603,11 @@
         <type>header</type>
         <style>table_dns table_dns_lexicon</style>
     </field>
+    <field>
+        <label>NOTE: A DNS sleep time of at least 1000 may be required.</label>
+        <type>header</type>
+        <style>table_dns table_dns_lexicon</style>
+    </field>
     <field>
         <id>validation.dns_lexicon_provider</id>
         <label>Provider</label>
@@ -623,6 +628,11 @@
         <type>header</type>
         <style>table_dns table_dns_linode</style>
     </field>
+    <field>
+        <label>NOTE: A DNS sleep time of at least 1000 is recommended.</label>
+        <type>header</type>
+        <style>table_dns table_dns_linode</style>
+    </field>
     <field>
         <id>validation.dns_linode_key</id>
         <label>Key</label>
@@ -633,6 +643,11 @@
         <type>header</type>
         <style>table_dns table_dns_linode_v4</style>
     </field>
+    <field>
+        <label>NOTE: A DNS sleep time of at least 1000 is recommended.</label>
+        <type>header</type>
+        <style>table_dns table_dns_linode_v4</style>
+    </field>
     <field>
         <id>validation.dns_linode_v4_key</id>
         <label>Key</label>
@@ -752,6 +767,11 @@
         <type>header</type>
         <style>table_dns table_dns_namesilo</style>
     </field>
+    <field>
+        <label>NOTE: A DNS sleep time of at least 1000 is recommended.</label>
+        <type>header</type>
+        <style>table_dns table_dns_namesilo</style>
+    </field>
     <field>
         <id>validation.dns_namesilo_key</id>
         <label>Key</label>
@@ -762,6 +782,11 @@
         <type>header</type>
         <style>table_dns table_dns_netcup</style>
     </field>
+    <field>
+        <label>NOTE: A DNS sleep time of at least 600 is recommended.</label>
+        <type>header</type>
+        <style>table_dns table_dns_netcup</style>
+    </field>
     <field>
         <id>validation.dns_netcup_cid</id>
         <label>Customer number</label>
@@ -1196,4 +1221,20 @@
         <label>deSEC domain</label>
         <type>text</type>
     </field>
+    <field>
+        <label>hexonet.com DNS API</label>
+        <type>header</type>
+        <style>table_dns table_dns_hexonet</style>
+    </field>
+    <field>
+        <id>validation.dns_hexonet_login</id>
+        <label>Login</label>
+        <type>text</type>
+        <help>This should be a combination of the username and role ID. For example, when the username is "myuser" and role ID is "testrole", then "myuser!testrole" must be used here.</help>
+    </field>
+    <field>
+        <id>validation.dns_hexonet_password</id>
+        <label>Password</label>
+        <type>password</type>
+    </field>
 </form>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsHexonet.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsHexonet.php
new file mode 100644
index 000000000..570b59dbf
--- /dev/null
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsHexonet.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright (C) 2020 Frank Wall
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OPNsense\AcmeClient\LeValidation;
+
+use OPNsense\AcmeClient\LeValidationInterface;
+use OPNsense\Core\Config;
+
+/**
+ * Hexonet DNS API
+ * @package OPNsense\AcmeClient
+ */
+class DnsHexonet extends Base implements LeValidationInterface
+{
+    public function prepare()
+    {
+        $this->acme_env['Hexonet_Login'] = (string)$this->config->dns_hexonet_login;
+        $this->acme_env['Hexonet_Password'] = (string)$this->config->dns_hexonet_password;
+    }
+}
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php
index 2ffc6d1ec..0173baa30 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLexicon.php
@@ -46,10 +46,5 @@ class DnsLexicon extends Base implements LeValidationInterface
         $this->acme_env['PROVIDER'] = $provider;
         $this->acme_env[$env_user] = (string)$this->config->dns_lexicon_user;
         $this->acme_env[$env_token] = (string)$this->config->dns_lexicon_token;
-
-        if ((string)$this->config->dns_lexicon_provider == 'namesilo') {
-            // Namesilo applies changes to DNS records only every 15 minutes.
-            $this->acme_args[] = '--dnssleep 960';
-        }
     }
 }
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php
index 2b2453b8b..e641fa483 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinode.php
@@ -40,7 +40,5 @@ class DnsLinode extends Base implements LeValidationInterface
     public function prepare()
     {
         $this->acme_env['LINODE_API_KEY'] = (string)$this->config->dns_linode_key;
-        // Linode can take up to 15 to update DNS records
-        $this->acme_args[] = '--dnssleep 960';
     }
 }
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php
index c69293a24..2bad2738a 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsLinodeV4.php
@@ -40,7 +40,5 @@ class DnsLinodeV4 extends Base implements LeValidationInterface
     public function prepare()
     {
         $this->acme_env['LINODE_V4_API_KEY'] = (string)$this->config->dns_linode_v4_key;
-        // Linode can take up to 15 to update DNS records
-        $this->acme_args[] = '--dnssleep 960';
     }
 }
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamesilo.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamesilo.php
index 1cfa7f326..98eca7ccf 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamesilo.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNamesilo.php
@@ -40,7 +40,5 @@ class DnsNamesilo extends Base implements LeValidationInterface
     public function prepare()
     {
         $this->acme_env['Namesilo_Key'] = (string)$this->config->dns_namesilo_key;
-        // Namesilo applies changes to DNS records only every 15 minutes.
-        $this->acme_args[] = '--dnssleep 960';
     }
 }
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php
index b4afca6cb..3c9955eda 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsNetcup.php
@@ -42,7 +42,5 @@ class DnsNetcup extends Base implements LeValidationInterface
         $this->acme_env['NC_CID'] = (string)$this->config->dns_netcup_cid;
         $this->acme_env['NC_Apikey'] = (string)$this->config->dns_netcup_key;
         $this->acme_env['NC_Apipw'] = (string)$this->config->dns_netcup_pw;
-        // netcup applies changes to DNS records only every 10 minutes.
-        $this->acme_args[] = '--dnssleep 600';
     }
 }
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
index b87b20dbc..02722c751 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
@@ -401,6 +401,7 @@
                         <dns_gcloud>Google Cloud DNS API</dns_gcloud>
                         <dns_gdnsdk>GratisDNS.dk</dns_gdnsdk>
                         <dns_hetzner>Hetzner DNS API</dns_hetzner>
+                        <dns_hexonet>hexonet.com DNS API</dns_hexonet>
                         <dns_hostingde>hosting.de API</dns_hostingde>
                         <dns_he>Hurricane Electric</dns_he>
                         <dns_infoblox>Infoblox API</dns_infoblox>
@@ -917,6 +918,12 @@
                 <dns_hetzner_token type="TextField">
                     <Required>N</Required>
                 </dns_hetzner_token>
+                <dns_hexonet_login type="TextField">
+                    <Required>N</Required>
+                </dns_hexonet_login>
+                <dns_hexonet_password type="TextField">
+                    <Required>N</Required>
+                </dns_hexonet_password>
                 <dns_1984hosting_user type="TextField">
                     <Required>N</Required>
                 </dns_1984hosting_user>