diff --git a/dns/dyndns/Makefile b/dns/dyndns/Makefile
index 451840d02..da4ebda94 100644
--- a/dns/dyndns/Makefile
+++ b/dns/dyndns/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		dyndns
-PLUGIN_VERSION=		1.23
-PLUGIN_REVISION=	2
+PLUGIN_VERSION=		1.24
 PLUGIN_COMMENT=		Dynamic DNS Support
 PLUGIN_MAINTAINER=	franco@opnsense.org
 
diff --git a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc
index 40744ebd5..865245694 100644
--- a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc
+++ b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns.inc
@@ -101,9 +101,9 @@ function dyndns_list()
         'azurev6' => 'Azure DNS (v6)',
         'citynetwork' => 'City Network',
         'cloudflare' => 'Cloudflare',
-        'cloudflare-v6' => 'Cloudflare (v6)',
         'cloudflare-token' => 'Cloudflare API token',
         'cloudflare-token-v6' => 'Cloudflare API token (v6)',
+        'cloudflare-v6' => 'Cloudflare (v6)',
         'custom' => 'Custom',
         'custom-v6' => 'Custom (v6)',
         'dhs' => 'DHS',
diff --git a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc
index c47e491bc..e86b66e00 100644
--- a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc
+++ b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc
@@ -1,57 +1,8 @@
 <?php
 
 /*
- * PHP.updateDNS (OPNsense version)
+ *  phpDynDNS
  *
- * +====================================================+
- *  Services Supported:
- *    - DynDns (dyndns.org) [dynamic, static, custom]
- *    - DHSDns (dhs.org)
- *    - No-IP (no-ip.com)
- *    - EasyDNS (easydns.com)
- *    - DHS (www.dhs.org)
- *    - HN (hn.org) -- incomplete checking!
- *    - DynS (dyns.org)
- *    - ZoneEdit (zoneedit.com)
- *    - FreeDNS (freedns.afraid.org)
- *    - Loopia (loopia.se)
- *    - StaticCling (staticcling.org)
- *    - DNSexit (dnsexit.com)
- *    - Namecheap (namecheap.com)
- *    - HE.net (dns.he.net)
- *    - HE.net IPv6 (dns.he.net)
- *    - HE.net Tunnelbroker IP update (ipv4.tunnelbroker.net)
- *    - SelfHost (selfhost.de)
- *    - Amazon Route53 (aws.amazon.com)
- *    - DNS-O-Matic (dnsomatic.com)
- *    - Custom dynamic DNS (any URL)
- *    - Custom dynamic DNS IPv6 (any URL)
- *    - Cloudflare (www.cloudflare.com)
- *    - Cloudflare IPv6 (www.cloudflare.com)
- *    - Cloudflare API token (www.cloudflare.com)
- *    - Cloudflare API token IPv6 (www.cloudflare.com)
- *    - Eurodns (eurodns.com)
- *    - GratisDNS (gratisdns.dk)
- *    - City Network (citynetwork.se)
- *    - Duck DNS (duckdns.org)
- *    - Google Domains (domains.google.com)
- *    - STRATO (strato.com)
- *    - 3322 (3322.net)
- *    - Oray (oray.com)
- *    - regfish (regfish.de)
- *    - regfish IPv6 (regfish.de)
- *    - dynv6 IPv6 (dynv6.com)
- *    - DigitalOcean (digitalocean.com)
- *    - Gandi LiveDNS (gandi.net)
- *    - Azure DNS (azure.microsoft.com)
- *    - Linode (linode.com)
- *    - Linode IPv6 (linode.com)
- *    - GoDaddy (godaddy.com)
- *    - GoDaddy IPv6 (godaddy.com)
- * +----------------------------------------------------+
- *  Requirements:
- *    - PHP version 4.0.2 or higher with the CURL Library and the PCRE Library
- * +----------------------------------------------------+
  *  Public Functions
  *    - updatedns()
  *
@@ -63,52 +14,52 @@
  *    - _debug()
  *    - _checkIP()
  * +----------------------------------------------------+
- *  DynDNS Dynamic              - Last Tested: 12 July 2005
- *  DynDNS Static               - Last Tested: NEVER
- *  DynDNS Custom               - Last Tested: NEVER
- *  No-IP                       - Last Tested: 20 July 2008
- *  HN.org                      - Last Tested: 12 July 2005
- *  EasyDNS                     - Last Tested: 20 July 2008
- *  DHS                         - Last Tested: 12 July 2005
- *  ZoneEdit                    - Last Tested: NEVER
- *  Dyns                        - Last Tested: NEVER
- *  ODS                         - Last Tested: 02 August 2005
- *  FreeDNS                     - Last Tested: 23 Feb 2011
- *  Loopia                      - Last Tested: NEVER
- *  StaticCling                 - Last Tested: 27 April 2006
- *  DNSexit                     - Last Tested: 20 July 2008
- *  Namecheap                   - Last Tested: 31 August 2010
- *  HE.net                      - Last Tested: 7 July 2013
- *  HE.net IPv6                 - Last Tested: 7 July 2013
- *  HE.net Tunnel               - Last Tested: 28 June 2011
- *  SelfHost                    - Last Tested: 26 December 2011
+ *  3322                        - Last Tested: 26 May 2017
  *  Amazon Route53              - Last Tested: 01 April 2012
- *  DNS-O-Matic                 - Last Tested: 9 September 2010
+ *  Amazon Route53 v6           - Last Tested: 19 November 2017
+ *  Azure DNS                   - Last Tested: 16 October 2019
+ *  City Network                - Last Tested: 13 November 2013
  *  Cloudflare                  - Last Tested: 16 April 2019
  *  Cloudflare IPv6             - Last Tested: 16 April 2019
  *  Cloudflare w/API token      - Last Tested: 13 June 2020
  *  Cloudflare w/API token v6   - Last Tested: NEVER
- *  Eurodns                     - Last Tested: 25 July 2018
- *  GratisDNS                   - Last Tested: 26 January 2020
- *  OVH DynHOST                 - Last Tested: NEVER
- *  City Network                - Last Tested: 13 November 2013
- *  Duck DNS                    - Last Tested: 04 March 2015
- *  Google Domains              - Last Tested: 20 February 2017
- *  STRATO                      - Last Tested: 09 May 2017
- *  3322                        - Last Tested: 26 May 2017
- *  Oray                        - Last Tested: 26 May 2017
- *  regfish                     - Last Tested: 15 August 2017
- *  regfish v6                  - Last Tested: 15 August 2017
- *  Amazon Route53 v6           - Last Tested: 19 November 2017
- *  dynv6                       - Last Tested: 25 June 2019
- *  dynv6 v6                    - Last Tested: 25 June 2019
+ *  DHS                         - Last Tested: 12 July 2005
+ *  DNS-O-Matic                 - Last Tested: 9 September 2010
+ *  DNSexit                     - Last Tested: 20 July 2008
  *  DigitalOcean                - Last Tested: 25 June 2019
- *  Azure DNS                   - Last Tested: 16 October 2019
- *  Linode                      - Last Tested: 25 February 2020
- *  Linode v6                   - Last Tested: 25 February 2020
+ *  Duck DNS                    - Last Tested: 04 March 2015
+ *  DynDNS Custom               - Last Tested: NEVER
+ *  DynDNS Dynamic              - Last Tested: 12 July 2005
+ *  DynDNS Static               - Last Tested: NEVER
+ *  Dyns                        - Last Tested: NEVER
+ *  EasyDNS                     - Last Tested: 20 July 2008
+ *  Eurodns                     - Last Tested: 25 July 2018
+ *  FreeDNS                     - Last Tested: 06 March 2021
+ *  Gandi LiveDNS               - Last Tested: 24 August 2020
  *  GoDaddy                     - Last Tested: 10 July 2020
  *  GoDaddy v6                  - Last Tested: 10 July 2020
- *  Gandi LiveDNS               - Last Tested: 24 August 2020
+ *  Google Domains              - Last Tested: 20 February 2017
+ *  GratisDNS                   - Last Tested: 26 January 2020
+ *  HE.net                      - Last Tested: 7 July 2013
+ *  HE.net IPv6                 - Last Tested: 7 July 2013
+ *  HE.net Tunnel               - Last Tested: 28 June 2011
+ *  HN.org                      - Last Tested: 12 July 2005
+ *  Linode                      - Last Tested: 25 February 2020
+ *  Linode v6                   - Last Tested: 25 February 2020
+ *  Loopia                      - Last Tested: NEVER
+ *  Namecheap                   - Last Tested: 31 August 2010
+ *  No-IP                       - Last Tested: 20 July 2008
+ *  ODS                         - Last Tested: 02 August 2005
+ *  OVH DynHOST                 - Last Tested: NEVER
+ *  Oray                        - Last Tested: 26 May 2017
+ *  STRATO                      - Last Tested: 09 May 2017
+ *  SelfHost                    - Last Tested: 26 December 2011
+ *  StaticCling                 - Last Tested: 27 April 2006
+ *  ZoneEdit                    - Last Tested: NEVER
+ *  dynv6                       - Last Tested: 25 June 2019
+ *  dynv6 v6                    - Last Tested: 25 June 2019
+ *  regfish                     - Last Tested: 15 August 2017
+ *  regfish v6                  - Last Tested: 15 August 2017
  * +====================================================+
  *
  * @author    E.Kristensen
@@ -125,7 +76,7 @@ class updatedns
     var $_cacheFile;
     var $_cacheFile_v6;
     var $_debugFile;
-    var $_UserAgent = 'User-Agent: phpDynDNS/0.7';
+    var $_UserAgent = 'User-Agent: phpDynDNS/0.8';
     var $_errorVerbosity = 0;
     var $_dnsService;
     var $_dnsUser;