diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index 89fa4e215..2e9de4081 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -1,214 +1,214 @@
 #!/usr/bin/env python3
 # Copyright (c) 2013-2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 # Generate seeds.txt from Pieter's DNS seeder
 #
 
 import collections
 import dns.resolver
 import re
 import sys
 
 NSEEDS = 512
 
 MAX_SEEDS_PER_ASN = 2
 
 MIN_BLOCKS = 540000
 
 # These are hosts that have been observed to be behaving strangely (e.g.
 # aggressively connecting to every node).
 SUSPICIOUS_HOSTS = {
     "23.92.36.9", "72.36.89.11", "130.211.129.106", "178.63.107.226",
     "83.81.130.26", "88.198.17.7", "148.251.238.178", "176.9.46.6",
     "54.173.72.127", "54.174.10.182", "54.183.64.54", "54.194.231.211",
     "54.66.214.167", "54.66.220.137", "54.67.33.14", "54.77.251.214",
     "54.94.195.96", "54.94.200.247"
 }
 
 
 PATTERN_IPV4 = re.compile(
     r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
 PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
 PATTERN_ONION = re.compile(
     r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
 
 # Used to only select nodes with a user agent string compatible with the
 # BCH/UAHF specification.
-PATTERN_AGENT = re.compile(r"^(/Bitcoin ABC:0.(22|23).(\d+)\(.+\)/)")
+PATTERN_AGENT = re.compile(r"^(/Bitcoin ABC:0.(23|24).(\d+)\(.+\)/)")
 
 
 def parseline(line):
     sline = line.split()
     if len(sline) < 11:
         return None
 
     # The user agent is at the end of the line. It may contain space, so we
     # concatenate.
     for i in range(12, len(sline)):
         sline[11] += ' ' + sline[i]
 
     # Remove leftovers
     del sline[12:]
 
     m = PATTERN_IPV4.match(sline[0])
     sortkey = None
     ip = None
     if m is None:
         m = PATTERN_IPV6.match(sline[0])
         if m is None:
             m = PATTERN_ONION.match(sline[0])
             if m is None:
                 return None
             else:
                 net = 'onion'
                 ipstr = sortkey = m.group(1)
                 port = int(m.group(2))
         else:
             net = 'ipv6'
             # Not interested in localhost
             if m.group(1) in ['::']:
                 return None
             ipstr = m.group(1)
             # XXX parse IPv6 into number, could use name_to_ipv6 from
             # generate-seeds
             sortkey = ipstr
             port = int(m.group(2))
     else:
         # Do IPv4 sanity check
         ip = 0
         for i in range(0, 4):
             if int(m.group(i + 2)) < 0 or int(m.group(i + 2)) > 255:
                 return None
             ip = ip + (int(m.group(i + 2)) << (8 * (3 - i)))
         if ip == 0:
             return None
         net = 'ipv4'
         sortkey = ip
         ipstr = m.group(1)
         port = int(m.group(6))
     # Skip bad results.
     if sline[1] == 0:
         return None
     # Extract uptime %.
     uptime30 = float(sline[7][:-1])
     # Extract Unix timestamp of last success.
     lastsuccess = int(sline[2])
     # Extract protocol version.
     version = int(sline[10])
     # Extract user agent.
     agent = sline[11][1:-1]
     # Extract service flags.
     service = int(sline[9], 16)
     # Extract blocks.
     blocks = int(sline[8])
     # Construct result.
     return {
         'net': net,
         'ip': ipstr,
         'port': port,
         'ipnum': ip,
         'uptime': uptime30,
         'lastsuccess': lastsuccess,
         'version': version,
         'agent': agent,
         'service': service,
         'blocks': blocks,
         'sortkey': sortkey,
     }
 
 
 def filtermultiport(ips):
     '''Filter out hosts with more nodes per IP'''
     hist = collections.defaultdict(list)
     for ip in ips:
         hist[ip['sortkey']].append(ip)
     return [value[0] for (key, value) in list(hist.items()) if len(value) == 1]
 
 # Based on Greg Maxwell's seed_filter.py
 
 
 def filterbyasn(ips, max_per_asn, max_total):
     # Sift out ips by type
     ips_ipv46 = [ip for ip in ips if ip['net'] in ['ipv4', 'ipv6']]
     ips_onion = [ip for ip in ips if ip['net'] == 'onion']
 
     # Filter IPv46 by ASN
     result = []
     asn_count = {}
     for ip in ips_ipv46:
         if len(result) == max_total:
             break
         try:
             if ip['net'] == 'ipv4':
                 ipaddr = ip['ip']
                 prefix = '.origin'
             else:
                 # http://www.team-cymru.com/IP-ASN-mapping.html
                 # 2001:4860:b002:23::68
                 res = str()
                 # pick the first 4 nibbles
                 for nb in ip['ip'].split(':')[:4]:
                     # right padded with '0'
                     for c in nb.zfill(4):
                         # 2001 4860 b002 0023
                         res += c + '.'
                 # 2.0.0.1.4.8.6.0.b.0.0.2.0.0.2.3
                 ipaddr = res.rstrip('.')
                 prefix = '.origin6'
 
             asn = int([x.to_text() for x in dns.resolver.query('.'.join(
                        reversed(ipaddr.split('.'))) + prefix + '.asn.cymru.com',
                 'TXT').response.answer][0].split('\"')[1].split(' ')[0])
             if asn not in asn_count:
                 asn_count[asn] = 0
             if asn_count[asn] == max_per_asn:
                 continue
             asn_count[asn] += 1
             result.append(ip)
         except Exception:
             sys.stderr.write(
                 'ERR: Could not resolve ASN for "' + ip['ip'] + '"\n')
 
     # Add back Onions
     result.extend(ips_onion)
     return result
 
 
 def main():
     lines = sys.stdin.readlines()
     ips = [parseline(line) for line in lines]
 
     # Skip entries with valid address.
     ips = [ip for ip in ips if ip is not None]
     # Skip entries from suspicious hosts.
     ips = [ip for ip in ips if ip['ip'] not in SUSPICIOUS_HOSTS]
     # Enforce minimal number of blocks.
     ips = [ip for ip in ips if ip['blocks'] >= MIN_BLOCKS]
     # Require service bit 1.
     ips = [ip for ip in ips if (ip['service'] & 1) == 1]
     # Require at least 50% 30-day uptime.
     ips = [ip for ip in ips if ip['uptime'] > 50]
     # Require a known and recent user agent.
     ips = [ip for ip in ips if PATTERN_AGENT.match(ip['agent'])]
 
     # Sort by availability (and use last success as tie breaker)
     ips.sort(key=lambda x:
              (x['uptime'], x['lastsuccess'], x['ip']), reverse=True)
     # Filter out hosts with multiple bitcoin ports, these are likely abusive
     ips = filtermultiport(ips)
     # Look up ASNs and limit results, both per ASN and globally.
     ips = filterbyasn(ips, MAX_SEEDS_PER_ASN, NSEEDS)
     # Sort the results by IP address (for deterministic output).
     ips.sort(key=lambda x: (x['net'], x['sortkey']))
 
     for ip in ips:
         if ip['net'] == 'ipv6':
             print('[{}]:{}'.format(ip['ip'], ip['port']))
         else:
             print('{}:{}'.format(ip['ip'], ip['port']))
 
 
 if __name__ == '__main__':
     main()