diff --git a/extra/uwhoisd.ini b/extra/uwhoisd.ini
index 86794f2..9ac8b3b 100644
--- a/extra/uwhoisd.ini
+++ b/extra/uwhoisd.ini
@@ -139,7 +139,9 @@ aaa=whois.nic.aaa
 aarp=whois.nic.aarp
 abb=whois.nic.abb
 abbott=whois.afilias-srs.net
+abbvie=whois.afilias-srs.net
 abogado=whois-dub.mm-registry.com
+abudhabi=whois.nic.abudhabi
 ac=whois.nic.ac
 academy=whois.donuts.co
 accenture=whois.nic.accenture
@@ -157,21 +159,25 @@ aero=whois.aero
 af=whois.nic.af
 afl=whois.nic.afl
 ag=whois.nic.ag
+agakhan=whois.afilias-srs.net
 agency=whois.donuts.co
 ai=whois.ai
 aig=whois.nic.aig
 airforce=whois.unitedtld.com
 airtel=whois.nic.airtel
+akdn=whois.afilias-srs.net
 al=whois.nic.al
 alibaba=whois.afilias-srs.net
 alipay=whois.afilias-srs.net
 allfinanz=whois.ksregistry.net
+ally=whois.afilias-srs.net
 alsace=whois-alsace.nic.fr
 am=whois.amnic.net
 amica=whois.nic.amica
 amsterdam=whois.nic.amsterdam
 analytics=whois.nic.analytics
 android=domain-registry-whois.l.google.com
+anquan=whois.teleinfo.cn
 apartments=whois.donuts.co
 app=whois.nic.google
 apple=whois.afilias-srs.net
@@ -194,10 +200,13 @@ audio=whois.uniregistry.net
 author=whois.nic.author
 auto=whois.uniregistry.net
 autos=whois.afilias-srs.net
+avianca=whois.afilias-srs.net
 aw=whois.nic.aw
+aws=whois.nic.aws
 ax=whois.ax
 axa=whois.nic.axa
 azure=whois.nic.azure
+baby=whois.nic.baby
 baidu=whois.ngtld.cn
 band=whois.rightside.co
 bank=whois.nic.bank
@@ -205,11 +214,13 @@ bar=whois.nic.bar
 barcelona=whois.nic.barcelona
 barclaycard=whois.nic.barclaycard
 barclays=whois.nic.barclays
+barefoot=whois.nic.barefoot
 bargains=whois.donuts.co
 bauhaus=whois.nic.bauhaus
 bayern=whois-dub.mm-registry.com
 bbc=whois.nic.bbc
 bbva=whois.nic.bbva
+bcg=whois.afilias-srs.net
 bcn=whois.nic.bcn
 be=whois.dns.be
 beats=whois.afilias-srs.net
@@ -290,7 +301,7 @@ cartier=whois.nic.cartier
 casa=whois-dub.mm-registry.com
 cash=whois.donuts.co
 casino=whois.donuts.co
-cat=whois.cat
+cat=whois.nic.cat
 catering=whois.donuts.co
 cba=whois.nic.cba
 cbn=whois.nic.cbn
@@ -409,7 +420,6 @@ docs=domain-registry-whois.l.google.com
 dog=whois.donuts.co
 doha=whois.nic.doha
 domains=whois.donuts.co
-doosan=whois.nic.doosan
 download=whois.nic.download
 drive=whois.nic.google
 dubai=whois.nic.dubai
@@ -444,6 +454,7 @@ exchange=whois.donuts.co
 expert=whois.donuts.co
 exposed=whois.donuts.co
 express=whois.donuts.co
+extraspace=whois.afilias-srs.net
 fage=whois.afilias-srs.net
 fail=whois.donuts.co
 fairwinds=whois.nic.fairwinds
@@ -489,12 +500,14 @@ fresenius=whois.ksregistry.net
 frl=whois.nic.frl
 frogans=whois-frogans.nic.fr
 frontier=whois.nic.frontier
+ftr=whois.nic.ftr
 fund=whois.donuts.co
 furniture=whois.donuts.co
 futbol=whois.unitedtld.com
 fyi=whois.donuts.co
 gal=whois.gal.coreregistry.net
 gallery=whois.donuts.co
+gallo=whois.nic.gallo
 gallup=whois.afilias-srs.net
 game=whois.uniregistry.net
 garden=whois-dub.mm-registry.com
@@ -519,6 +532,7 @@ gle=domain-registry-whois.l.google.com
 global=whois.nic.global
 globo=whois.gtlds.nic.br
 gmail=domain-registry-whois.l.google.com
+gmbh=whois.donuts.co
 gmo=whois.nic.gmo
 gmx=whois-fe1.gmx.tango.knipp.de
 gold=whois.donuts.co
@@ -577,6 +591,7 @@ how=domain-registry-whois.l.google.com
 hr=whois.dns.hr
 hsbc=whois.nic.hsbc
 ht=whois.nic.ht
+htc=whois.nic.htc
 hu=whois.nic.hu
 hyundai=whois.nic.hyundai
 ibm=whois.nic.ibm
@@ -589,6 +604,7 @@ ifm=whois.nic.ifm
 iinet=whois.aridnrs.net.au
 il=whois.isoc.org.il
 im=whois.nic.im
+imamat=whois.afilias-srs.net
 immo=whois.donuts.co
 immobilien=whois.unitedtld.com
 in=whois.inregistry.net
@@ -610,6 +626,7 @@ ir=whois.nic.ir
 irish=whois.afilias-srs.net
 is=whois.isnic.is
 iselect=whois.nic.iselect
+ismaili=whois.afilias-srs.net
 ist=whois.afilias-srs.net
 istanbul=whois.afilias-srs.net
 it=whois.nic.it
@@ -618,12 +635,14 @@ iwc=whois.nic.iwc
 jaguar=whois.nic.jaguar
 java=whois.nic.java
 jcb=whois.nic.gmo
+jcp=whois.afilias-srs.net
 je=whois.je
 jetzt=whois.nic.jetzt
 jewelry=whois.donuts.co
 jlc=whois.nic.jlc
 jll=whois.afilias-srs.net
 jmp=whois.nic.jmp
+jnj=whois.nic.jnj
 jobs=whois.nic.jobs
 joburg=joburg-whois.registry.net.za
 jot=whois.nic.jot
@@ -649,6 +668,7 @@ kiwi=whois.nic.kiwi
 kn=whois.nic.kn
 koeln=whois-fe1.pdt.koeln.tango.knipp.de
 komatsu=whois.nic.komatsu
+kpmg=whois.nic.kpmg
 kpn=whois.nic.kpn
 kr=whois.kr
 krd=whois.aridnrs.net.au
@@ -696,6 +716,7 @@ lixil=whois.nic.lixil
 lk=whois.nic.lk
 loan=whois.nic.loan
 loans=whois.donuts.co
+locus=whois.nic.locus
 lol=whois.uniregistry.net
 london=whois-lon.mm-registry.com
 lotte=whois.nic.lotte
@@ -740,6 +761,7 @@ microsoft=whois.nic.microsoft
 mini=whois.ksregistry.net
 mk=whois.marnet.mk
 ml=whois.dot.ml
+mls=whois.nic.mls
 mma=whois-mma.nic.fr
 mn=whois.nic.mn
 mo=whois.monic.mo
@@ -767,6 +789,7 @@ mtpc=whois.nic.gmo
 mtr=whois.nic.mtr
 mu=whois.nic.mu
 museum=whois.museum
+mutual=whois.nic.mutual
 mutuelle=whois-mutuelle.nic.fr
 mx=whois.mx
 my=whois.mynic.my
@@ -794,9 +817,11 @@ nico=whois.nic.nico
 nikon=whois.nic.nikon
 ninja=whois.unitedtld.com
 nissan=whois.nic.gmo
+nissay=whois.nic.nissay
 nl=whois.domain-registry.nl
 no=whois.norid.no
 nokia=whois.afilias-srs.net
+northwesternmutual=whois.nic.northwesternmutual
 norton=whois.nic.norton
 nowruz=whois.agitsys.net
 nra=whois.afilias-srs.net
@@ -869,6 +894,7 @@ pro=whois.afilias.net
 prod=domain-registry-whois.l.google.com
 productions=whois.donuts.co
 prof=domain-registry-whois.l.google.com
+progressive=whois.afilias-srs.net
 promo=whois.afilias.net
 properties=whois.donuts.co
 property=whois.uniregistry.net
@@ -889,7 +915,7 @@ realtor=whois.nic.realtor
 realty=whois.nic.realty
 recipes=whois.donuts.co
 red=whois.afilias.net
-redstone=whois.afilias-srs.net
+redstone=whois.nic.redstone
 redumbrella=whois.afilias-srs.net
 rehab=whois.rightside.co
 reise=whois.nic.reise
@@ -939,6 +965,7 @@ sarl=whois.donuts.co
 sas=whois.nic.sas
 saxo=whois.aridnrs.net.au
 sb=whois.nic.net.sb
+sbi=whois.afilias-srs.net
 sbs=whois.nic.sbs
 sc=whois2.afilias-grs.net
 sca=whois.nic.sca
@@ -967,13 +994,16 @@ sfr=whois.nic.sfr
 sg=whois.sgnic.sg
 sh=whois.nic.sh
 sharp=whois.nic.gmo
+shaw=whois.afilias-srs.net
 shell=whois.nic.shell
 shia=whois.agitsys.net
 shiksha=whois.afilias.net
 shoes=whois.donuts.co
+shouji=whois.teleinfo.cn
 show=whois.donuts.co
 shriram=whois.afilias-srs.net
 si=whois.register.si
+sina=whois.afilias-srs.net
 singles=whois.donuts.co
 site=whois.centralnic.com
 sk=whois.sk-nic.sk
@@ -1006,6 +1036,7 @@ st=whois.nic.st
 stada=whois.afilias-srs.net
 star=whois.afilias-srs.net
 starhub=whois.nic.starhub
+statebank=whois.afilias-srs.net
 statefarm=whois.nic.statefarm
 statoil=whois.nic.statoil
 stc=whois.centralnic.com
@@ -1013,6 +1044,7 @@ stcgroup=whois.centralnic.com
 stockholm=whois.afilias-srs.net
 storage=whois.afilias-srs.net
 store=whois.nic.store
+stream=whois.nic.stream
 studio=whois.rightside.co
 study=whois.nic.study
 style=whois.donuts.co
@@ -1033,6 +1065,7 @@ symantec=whois.nic.symantec
 systems=whois.donuts.co
 tab=whois.nic.tab
 taipei=whois.nic.taipei
+talk=whois.nic.talk
 taobao=whois.nic.taobao
 tatamotors=whois.nic.tatamotors
 tatar=whois.nic.tatar
@@ -1049,6 +1082,7 @@ telecity=whois.nic.telecity
 telefonica=whois-fe.telefonica.tango.knipp.de
 temasek=whois.afilias-srs.net
 tennis=whois.donuts.co
+teva=whois.nic.teva
 tf=whois.nic.tf
 tg=whois.nic.tg
 th=whois.thnic.co.th
@@ -1073,6 +1107,7 @@ tools=whois.donuts.co
 top=whois.nic.top
 toray=whois.nic.toray
 toshiba=whois.nic.toshiba
+total=whois-total.nic.fr
 tours=whois.donuts.co
 town=whois.donuts.co
 toyota=whois.nic.toyota
@@ -1118,6 +1153,7 @@ vg=whois.nic.vg
 vi=whois.nic.vi
 viajes=whois.donuts.co
 video=whois.rightside.co
+vig=whois.afilias-srs.net
 viking=whois.afilias-srs.net
 villas=whois.donuts.co
 vin=whois.donuts.co
@@ -1150,6 +1186,7 @@ weber=whois.nic.weber
 website=whois.nic.website
 wed=whois.nic.wed
 wedding=whois-dub.mm-registry.com
+weibo=whois.afilias-srs.net
 weir=whois.nic.weir
 wf=whois.nic.wf
 whoswho=whois.nic.whoswho
@@ -1169,11 +1206,12 @@ wtc=whois.nic.wtc
 wtf=whois.donuts.co
 xbox=whois.nic.xbox
 xerox=whois.nic.xerox
-xin=whois.afilias-srs.net
+xihuan=whois.teleinfo.cn
+xin=whois.nic.xin
 xn--11b4c3d=whois.nic.xn--11b4c3d
 xn--1ck2e1b=whois.nic.xn--1ck2e1b
 xn--1qqw23a=whois.ngtld.cn
-xn--30rr7y=whois.nic.wang
+xn--30rr7y=whois.gtld.knet.cn
 xn--3bst00m=whois.gtld.knet.cn
 xn--3ds443g=whois.afilias-srs.net
 xn--3e0b707e=whois.kr
@@ -1183,6 +1221,7 @@ xn--45q11c=whois.nic.xn--45q11c
 xn--4gbrim=whois.afilias-srs.net
 xn--55qw42g=whois.conac.cn
 xn--55qx5d=whois.ngtld.cn
+xn--5tzm5g=whois.afilias-srs.net
 xn--6frz82g=whois.afilias.net
 xn--6qq986b3xl=whois.gtld.knet.cn
 xn--80adxhks=whois.nic.xn--80adxhks
@@ -1193,7 +1232,8 @@ xn--8y0a063a=whois.nic.xn--8y0a063a
 xn--90a3ac=whois.rnids.rs
 xn--90ais=whois.cctld.by
 xn--9dbq2a=whois.nic.xn--9dbq2a
-xn--9et52u=whois.nic.wang
+xn--9et52u=whois.gtld.knet.cn
+xn--9krt00a=whois.afilias-srs.net
 xn--b4w605ferd=whois.afilias-srs.net
 xn--bck1b9a5dre4c=whois.nic.xn--bck1b9a5dre4c
 xn--c1avg=whois.publicinterestregistry.net
@@ -1209,6 +1249,7 @@ xn--d1alf=whois.marnet.mk
 xn--eckvdtc9d=whois.nic.xn--eckvdtc9d
 xn--efvy88h=whois.nic.xn--efvy88h
 xn--estv75g=whois.afilias-srs.net
+xn--fct429k=whois.nic.xn--fct429k
 xn--fhbei=whois.nic.xn--fhbei
 xn--fiq228c5hs=whois.afilias-srs.net
 xn--fiq64b=whois.gtld.knet.cn
@@ -1239,6 +1280,7 @@ xn--mgba3a4f16a=whois.nic.ir
 xn--mgbaam7a8h=whois.aeda.net.ae
 xn--mgbab2bd=whois.bazaar.coreregistry.net
 xn--mgbb9fbpob=whois.nic.xn--mgbb9fbpob
+xn--mgbca7dzdo=whois.nic.xn--mgbca7dzdo
 xn--mgberp4a5d4ar=whois.nic.net.sa
 xn--mgbt3dhd=whois.agitsys.net
 xn--mgbtx2b=whois.cmc.iq
@@ -1287,8 +1329,10 @@ yandex=whois.nic.yandex
 yodobashi=whois.nic.gmo
 yoga=whois-dub.mm-registry.com
 yokohama=whois.nic.yokohama
+you=whois.nic.you
 youtube=domain-registry-whois.l.google.com
 yt=whois.nic.yt
+yun=whois.teleinfo.cn
 zara=whois.afilias-srs.net
 zero=whois.nic.zero
 zip=domain-registry-whois.l.google.com