whois 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c8017eab3bb6d019a3f05287c19973587cbdf10
-  data.tar.gz: 7f5ec3b7132f1d5ccc01df0b9c24fd69b515c3bc
+SHA256:
+  metadata.gz: 69346b60ba0d804c4084a84e4e9da3d47320d8c3255c0616041edad685eaf2ce
+  data.tar.gz: cc9b75324370b25c38371bcf5fa6c12c8124301cb40d1c7caccd6ea1e891eb5f
 SHA512:
-  metadata.gz: dd9f2032f47c87f78348f7386a033cddd369d6dcbd92ef6fd506f31a0374b12fe5efb5fe22598d6fdd18f3828ae69f31676eaa6229be766f8171241316604b2f
-  data.tar.gz: 9f9014d4d94a81398d60003c9ce49f8974865b3f9052db14e327a349fabe4a99ac5a802274182e04503135412b0a2b6e790bc19651d39b908018e634ef3719ef
+  metadata.gz: dead3c2b10a7ef26f8cf4a9aa2a4243f53b491d0e70b17210c449419bd4c3f3f15d03939b3a1c22b35eec8e76b33451b5c560071370edeae23bf96832e82e42b
+  data.tar.gz: dfec9fb6424f36f2cd39a3ecdb1e866b09c2962ced0d458bf57f008ea1dacde73599a680c45bec805d3d57c52394f4553dd54d840ab6ecccf1734d28320195a8

data/CHANGELOG.md

@@ -3,10 +3,16 @@
 This project uses [Semantic Versioning 2.0.0](http://semver.org/).
 
 
+#### Release 4.0.6
+
+- SERVER: Added .SPORT, .LLC, .FM (GH-568)
+- SERVER: Updated .MUSEUM, .MR, .PR, .AI, .SMART, .BAIDU, .GE, several newGTLDs
+- SERVER: Deleted .HTC
+
+
 #### Release 4.0.5
 
 - SERVER: Updated .ALIBABA, .ALIPAY, .HDFC, .SINA, .WEIBO, .XN--9KRT00A, .XN--JLQ61U9W7B
-
 - SERVER: Deleted .MCD, .MCDONALDS, .PAMPEREDCHEF, .MONTBLANK, .CHLOE
 
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2017 Simone Carletti
+Copyright (c) 2009-2018 Simone Carletti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -43,7 +43,7 @@ For older versions of Ruby, see the [CHANGELOG](CHANGELOG.md).
 You can install the gem manually:
 
 ```shell
-$ gem install whois
+gem install whois
 ```
 
 Or use [Bundler](http://bundler.io/) and define it as a dependency in your `Gemfile`:
@@ -55,7 +55,7 @@ gem 'whois'
 To use the WHOIS parser component you need to install the `whois-parser` gem:
 
 ```shell
-$ gem install whois-parser
+gem install whois-parser
 ```
 
 ```ruby
@@ -213,4 +213,4 @@ Report issues or feature requests to [GitHub Issues](https://github.com/weppos/w
 
 ## License
 
-Copyright (c) 2009-2017 [Simone Carletti](https://simonecarletti.com/). This is Free Software distributed under the MIT license.
+Copyright (c) 2009-2018 [Simone Carletti](https://simonecarletti.com/). This is Free Software distributed under the MIT license.

data/data/tld.json

@@ -1,7 +1,7 @@
 {
   "_": {
     "schema": "2",
-    "updated": "2017-10-17 08:14:20 UTC"
+    "updated": "2018-03-26 13:29:17 UTC"
   },
   "aaa": {
     "_type": "newgtld",
@@ -53,7 +53,7 @@
   "academy": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.academy"
   },
   "accenture": {
     "_type": "newgtld",
@@ -66,7 +66,7 @@
   "accountants": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.accountants"
   },
   "aco": {
     "_group": "afiliassrs",
@@ -81,7 +81,7 @@
   "actor": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.actor"
   },
   "ad": {
     "adapter": "none"
@@ -141,10 +141,10 @@
   "agency": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.agency"
   },
   "ai": {
-    "host": "whois.ai"
+    "host": "whois.nic.ai"
   },
   "aig": {
     "_type": "newgtld",
@@ -162,7 +162,7 @@
   "airforce": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.airforce"
   },
   "airtel": {
     "_type": "newgtld",
@@ -270,7 +270,7 @@
   "apartments": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.apartments"
   },
   "app": {
     "_group": "google",
@@ -298,14 +298,14 @@
     "adapter": "none"
   },
   "archi": {
-    "_group": "ksregistry",
+    "_group": "afilias",
     "_type": "newgtld",
     "host": "whois.afilias.net"
   },
   "army": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.army"
   },
   "arpa": {
     "host": "whois.iana.org"
@@ -338,7 +338,7 @@
   "associates": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.associates"
   },
   "at": {
     "host": "whois.nic.at"
@@ -353,7 +353,7 @@
   "attorney": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.attorney"
   },
   "au": {
     "host": "whois.audns.net.au"
@@ -361,7 +361,7 @@
   "auction": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.auction"
   },
   "audi": {
     "_group": "afiliassrs",
@@ -434,9 +434,9 @@
     "adapter": "none"
   },
   "baidu": {
-    "_group": "ngtld",
+    "_group": "knet",
     "_type": "newgtld",
-    "host": "whois.ngtld.cn"
+    "host": "whois.gtld.knet.cn"
   },
   "banamex": {
     "_type": "newgtld",
@@ -449,7 +449,7 @@
   "band": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.band"
   },
   "bank": {
     "_type": "newgtld",
@@ -478,7 +478,7 @@
   "bargains": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.bargains"
   },
   "baseball": {
     "_type": "newgtld",
@@ -593,7 +593,7 @@
   "bike": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.bike"
   },
   "bing": {
     "_type": "newgtld",
@@ -602,7 +602,7 @@
   "bingo": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.bingo"
   },
   "bio": {
     "_group": "ksregistry",
@@ -739,7 +739,7 @@
   "boutique": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.boutique"
   },
   "box": {
     "_group": "aridnrs",
@@ -800,12 +800,12 @@
   "builders": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.builders"
   },
   "business": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.business"
   },
   "buy": {
     "_group": "amazonregistry",
@@ -848,12 +848,12 @@
   "cab": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cab"
   },
   "cafe": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cafe"
   },
   "cal": {
     "_group": "google",
@@ -877,12 +877,12 @@
   "camera": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.camera"
   },
   "camp": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.camp"
   },
   "cancerresearch": {
     "_type": "newgtld",
@@ -901,7 +901,7 @@
   "capital": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.capital"
   },
   "capitalone": {
     "_type": "newgtld",
@@ -919,12 +919,12 @@
   "cards": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cards"
   },
   "care": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.care"
   },
   "career": {
     "_type": "newgtld",
@@ -933,7 +933,7 @@
   "careers": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.careers"
   },
   "cars": {
     "_group": "uniregistry",
@@ -962,12 +962,12 @@
   "cash": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cash"
   },
   "casino": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.casino"
   },
   "cat": {
     "host": "whois.nic.cat",
@@ -977,7 +977,7 @@
   "catering": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.catering"
   },
   "catholic": {
     "_group": "aridnrs",
@@ -1016,7 +1016,7 @@
   "center": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.center"
   },
   "ceo": {
     "_type": "newgtld",
@@ -1060,12 +1060,12 @@
   "chat": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.chat"
   },
   "cheap": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cheap"
   },
   "chintai": {
     "_type": "newgtld",
@@ -1089,7 +1089,7 @@
   "church": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.church"
   },
   "ci": {
     "host": "whois.nic.ci"
@@ -1123,7 +1123,7 @@
   "city": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.city"
   },
   "cityeats": {
     "_type": "newgtld",
@@ -1138,12 +1138,12 @@
   "claims": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.claims"
   },
   "cleaning": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cleaning"
   },
   "click": {
     "_group": "uniregistry",
@@ -1153,7 +1153,7 @@
   "clinic": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.clinic"
   },
   "clinique": {
     "_group": "afiliassrs",
@@ -1163,7 +1163,7 @@
   "clothing": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.clothing"
   },
   "cloud": {
     "_type": "newgtld",
@@ -1192,17 +1192,17 @@
   "coach": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.coach"
   },
   "codes": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.codes"
   },
   "coffee": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.coffee"
   },
   "college": {
     "_type": "newgtld",
@@ -1338,12 +1338,12 @@
   "community": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.community"
   },
   "company": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.company"
   },
   "compare": {
     "_type": "newgtld",
@@ -1352,7 +1352,7 @@
   "computer": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.computer"
   },
   "comsec": {
     "_type": "newgtld",
@@ -1361,17 +1361,17 @@
   "condos": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.condos"
   },
   "construction": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.construction"
   },
   "consulting": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.consulting"
   },
   "contact": {
     "_type": "newgtld",
@@ -1380,7 +1380,7 @@
   "contractors": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.contractors"
   },
   "cooking": {
     "_group": "mmregistry",
@@ -1394,7 +1394,7 @@
   "cool": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cool"
   },
   "coop": {
     "host": "whois.nic.coop"
@@ -1417,7 +1417,7 @@
   "coupons": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.coupons"
   },
   "courses": {
     "_group": "aridnrs",
@@ -1430,12 +1430,12 @@
   "credit": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.credit"
   },
   "creditcard": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.creditcard"
   },
   "creditunion": {
     "_group": "afiliassrs",
@@ -1462,7 +1462,7 @@
   "cruises": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.cruises"
   },
   "csc": {
     "_type": "newgtld",
@@ -1515,7 +1515,7 @@
   "dance": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.dance"
   },
   "data": {
     "_group": "afiliassrs",
@@ -1529,7 +1529,7 @@
   "dating": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.dating"
   },
   "datsun": {
     "_group": "gmo",
@@ -1573,17 +1573,17 @@
   "deals": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.deals"
   },
   "degree": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.degree"
   },
   "delivery": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.delivery"
   },
   "dell": {
     "_type": "newgtld",
@@ -1601,17 +1601,17 @@
   "democrat": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.democrat"
   },
   "dental": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.dental"
   },
   "dentist": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.dentist"
   },
   "desi": {
     "_group": "ksregistry",
@@ -1634,7 +1634,7 @@
   "diamonds": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.diamonds"
   },
   "diet": {
     "_group": "uniregistry",
@@ -1644,22 +1644,22 @@
   "digital": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.digital"
   },
   "direct": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.direct"
   },
   "directory": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.directory"
   },
   "discount": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.discount"
   },
   "discover": {
     "_type": "newgtld",
@@ -1702,7 +1702,7 @@
   "doctor": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.doctor"
   },
   "dodge": {
     "_group": "afiliassrs",
@@ -1712,7 +1712,7 @@
   "dog": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.dog"
   },
   "doha": {
     "_type": "newgtld",
@@ -1721,7 +1721,7 @@
   "domains": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.domains"
   },
   "doosan": {
     "host": "whois.nic.xn--cg4bki"
@@ -1812,7 +1812,7 @@
   "education": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.education"
   },
   "ee": {
     "host": "whois.tld.ee"
@@ -1824,7 +1824,7 @@
   "email": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.email"
   },
   "emerck": {
     "_group": "afiliassrs",
@@ -1834,22 +1834,22 @@
   "energy": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.energy"
   },
   "engineer": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.engineer"
   },
   "engineering": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.engineering"
   },
   "enterprises": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.enterprises"
   },
   "epost": {
     "_type": "newgtld",
@@ -1863,7 +1863,7 @@
   "equipment": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.equipment"
   },
   "er": {
     "adapter": "none"
@@ -1887,7 +1887,7 @@
   "estate": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.estate"
   },
   "esurance": {
     "_group": "afiliassrs",
@@ -1916,7 +1916,7 @@
   "events": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.events"
   },
   "everbank": {
     "_type": "newgtld",
@@ -1925,22 +1925,22 @@
   "exchange": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.exchange"
   },
   "expert": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.expert"
   },
   "exposed": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.exposed"
   },
   "express": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.express"
   },
   "extraspace": {
     "_group": "afiliassrs",
@@ -1955,7 +1955,7 @@
   "fail": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.fail"
   },
   "fairwinds": {
     "_type": "newgtld",
@@ -1968,7 +1968,7 @@
   "family": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.family"
   },
   "fan": {
     "_group": "centralnic",
@@ -1983,7 +1983,7 @@
   "farm": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.farm"
   },
   "farmers": {
     "_type": "newgtld",
@@ -2047,12 +2047,12 @@
   "finance": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.finance"
   },
   "financial": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.financial"
   },
   "fire": {
     "_group": "amazonregistry",
@@ -2070,7 +2070,7 @@
   "fish": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.fish"
   },
   "fishing": {
     "_group": "mmregistry",
@@ -2085,7 +2085,7 @@
   "fitness": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.fitness"
   },
   "fj": {
     "host": "whois.usp.ac.fj"
@@ -2100,7 +2100,7 @@
   "flights": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.flights"
   },
   "flir": {
     "_type": "newgtld",
@@ -2109,7 +2109,7 @@
   "florist": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.florist"
   },
   "flowers": {
     "_group": "uniregistry",
@@ -2122,8 +2122,7 @@
     "host": "whois.nic.google"
   },
   "fm": {
-    "adapter": "web",
-    "url": "http://dot.fm/whois.html"
+    "host": "whois.nic.fm"
   },
   "fo": {
     "host": "whois.nic.fo"
@@ -2144,7 +2143,7 @@
   "football": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.football"
   },
   "ford": {
     "_type": "newgtld",
@@ -2157,7 +2156,7 @@
   "forsale": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.forsale"
   },
   "forum": {
     "_group": "centralnic",
@@ -2167,7 +2166,7 @@
   "foundation": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.foundation"
   },
   "fox": {
     "_type": "newgtld",
@@ -2279,22 +2278,22 @@
   "fund": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.fund"
   },
   "furniture": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.furniture"
   },
   "futbol": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.futbol"
   },
   "fyi": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.fyi"
   },
   "ga": {
     "host": "whois.dot.ga"
@@ -2307,7 +2306,7 @@
   "gallery": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.gallery"
   },
   "gallo": {
     "_type": "newgtld",
@@ -2326,7 +2325,7 @@
   "games": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.games"
   },
   "gap": {
     "_type": "newgtld",
@@ -2353,8 +2352,7 @@
     "host": "whois.nic.gdn"
   },
   "ge": {
-    "adapter": "web",
-    "url": "http://www.registration.ge/"
+    "host": "whois.registration.ge"
   },
   "gea": {
     "_group": "afiliassrs",
@@ -2400,12 +2398,12 @@
   "gifts": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.gifts"
   },
   "gives": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.gives"
   },
   "giving": {
     "_type": "newgtld",
@@ -2421,7 +2419,7 @@
   "glass": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.glass"
   },
   "gle": {
     "_group": "google",
@@ -2449,7 +2447,7 @@
   "gmbh": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.gmbh"
   },
   "gmoregistry": {
     "_group": "gmo",
@@ -2471,7 +2469,7 @@
   "gold": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.gold"
   },
   "goldpoint": {
     "_group": "gmo",
@@ -2481,7 +2479,7 @@
   "golf": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.golf"
   },
   "goo": {
     "_group": "gmo",
@@ -2539,12 +2537,12 @@
   "graphics": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.graphics"
   },
   "gratis": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.gratis"
   },
   "green": {
     "_group": "afilias",
@@ -2554,7 +2552,7 @@
   "gripe": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.gripe"
   },
   "grocery": {
     "_type": "newgtld",
@@ -2563,7 +2561,7 @@
   "group": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.group"
   },
   "gs": {
     "host": "whois.nic.gs"
@@ -2592,7 +2590,7 @@
   "guide": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.guide"
   },
   "guitars": {
     "_group": "uniregistry",
@@ -2602,7 +2600,7 @@
   "guru": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.guru"
   },
   "gw": {
     "adapter": "web",
@@ -2627,7 +2625,7 @@
   "haus": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.haus"
   },
   "hbo": {
     "_type": "newgtld",
@@ -2650,7 +2648,7 @@
   "healthcare": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.healthcare"
   },
   "help": {
     "_group": "uniregistry",
@@ -2723,17 +2721,17 @@
   "hockey": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.hockey"
   },
   "holdings": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.holdings"
   },
   "holiday": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.holiday"
   },
   "homedepot": {
     "_group": "afiliassrs",
@@ -2769,7 +2767,7 @@
   "hospital": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.hospital"
   },
   "host": {
     "_type": "newgtld",
@@ -2800,7 +2798,7 @@
   "house": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.house"
   },
   "how": {
     "_group": "google",
@@ -2817,10 +2815,6 @@
   "ht": {
     "host": "whois.nic.ht"
   },
-  "htc": {
-    "_type": "newgtld",
-    "adapter": "none"
-  },
   "hu": {
     "host": "whois.nic.hu"
   },
@@ -2891,12 +2885,12 @@
   "immo": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.immo"
   },
   "immobilien": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.immobilien"
   },
   "in": {
     "host": "whois.inregistry.net"
@@ -2904,7 +2898,7 @@
   "industries": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.industries"
   },
   "infiniti": {
     "_group": "gmo",
@@ -2927,7 +2921,7 @@
   "institute": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.institute"
   },
   "insurance": {
     "_type": "newgtld",
@@ -2936,7 +2930,7 @@
   "insure": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.insure"
   },
   "int": {
     "host": "whois.iana.org"
@@ -2948,7 +2942,7 @@
   "international": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.international"
   },
   "intuit": {
     "_type": "newgtld",
@@ -2957,7 +2951,7 @@
   "investments": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.investments"
   },
   "io": {
     "host": "whois.nic.io"
@@ -2975,7 +2969,7 @@
   "irish": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.irish"
   },
   "is": {
     "host": "whois.isnic.is"
@@ -3049,12 +3043,13 @@
   "jetzt": {
     "_group": "donuts",
     "_type": "newgtld",
-    "adapter": "none"
+    "adapter": "none",
+    "host": "whois.nic.jetzt"
   },
   "jewelry": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.jewelry"
   },
   "jio": {
     "_group": "afiliassrs",
@@ -3129,7 +3124,7 @@
   "kaufen": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.kaufen"
   },
   "kddi": {
     "_group": "gmo",
@@ -3186,7 +3181,7 @@
   "kitchen": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.kitchen"
   },
   "kiwi": {
     "_type": "newgtld",
@@ -3291,7 +3286,7 @@
   "land": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.land"
   },
   "landrover": {
     "_type": "newgtld",
@@ -3327,7 +3322,7 @@
   "lawyer": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.lawyer"
   },
   "lb": {
     "adapter": "web",
@@ -3345,7 +3340,7 @@
   "lease": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.lease"
   },
   "leclerc": {
     "_group": "nicfr",
@@ -3359,7 +3354,7 @@
   "legal": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.legal"
   },
   "lego": {
     "_type": "newgtld",
@@ -3388,7 +3383,7 @@
   "life": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.life"
   },
   "lifeinsurance": {
     "_type": "newgtld",
@@ -3401,7 +3396,7 @@
   "lighting": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.lighting"
   },
   "like": {
     "_group": "amazonregistry",
@@ -3415,12 +3410,12 @@
   "limited": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.limited"
   },
   "limo": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.limo"
   },
   "lincoln": {
     "_type": "newgtld",
@@ -3442,7 +3437,7 @@
   "live": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.live"
   },
   "living": {
     "_type": "newgtld",
@@ -3455,6 +3450,11 @@
   "lk": {
     "host": "whois.nic.lk"
   },
+  "llc": {
+    "_group": "afilias",
+    "_type": "newgtld",
+    "host": "whois.afilias.net"
+  },
   "loan": {
     "_type": "newgtld",
     "host": "whois.nic.loan"
@@ -3462,7 +3462,7 @@
   "loans": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.loans"
   },
   "locker": {
     "_group": "afiliassrs",
@@ -3523,7 +3523,7 @@
   "ltd": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.ltd"
   },
   "ltda": {
     "_group": "afiliassrs",
@@ -3575,7 +3575,7 @@
   "maison": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.maison"
   },
   "makeup": {
     "_type": "newgtld",
@@ -3588,7 +3588,7 @@
   "management": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.management"
   },
   "mango": {
     "_group": "coreregistry",
@@ -3603,12 +3603,12 @@
   "market": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.market"
   },
   "marketing": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.marketing"
   },
   "markets": {
     "_type": "newgtld",
@@ -3635,7 +3635,7 @@
   "mba": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.mba"
   },
   "mc": {
     "adapter": "none"
@@ -3658,7 +3658,7 @@
   "media": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.media"
   },
   "meet": {
     "_group": "google",
@@ -3678,7 +3678,7 @@
   "memorial": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.memorial"
   },
   "men": {
     "_type": "newgtld",
@@ -3782,7 +3782,7 @@
   "moda": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.moda"
   },
   "moe": {
     "_type": "newgtld",
@@ -3805,7 +3805,7 @@
   "money": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.money"
   },
   "monster": {
     "_group": "afiliassrs",
@@ -3829,7 +3829,7 @@
   "mortgage": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.mortgage"
   },
   "moscow": {
     "_type": "newgtld",
@@ -3852,7 +3852,7 @@
   "movie": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.movie"
   },
   "movistar": {
     "_group": "knipp",
@@ -3866,7 +3866,8 @@
     "host": "whois.mediaserv.net"
   },
   "mr": {
-    "adapter": "none"
+    "adapter": "none",
+    "host": "whois.nic.mr"
   },
   "ms": {
     "host": "whois.nic.ms"
@@ -3891,7 +3892,7 @@
     "host": "whois.nic.mu"
   },
   "museum": {
-    "host": "whois.museum"
+    "host": "whois.nic.museum"
   },
   "mutual": {
     "_type": "newgtld",
@@ -3945,7 +3946,7 @@
   "navy": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.navy"
   },
   "nba": {
     "_type": "newgtld",
@@ -4009,7 +4010,7 @@
   "network": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.network"
   },
   "neustar": {
     "_type": "newgtld",
@@ -4028,7 +4029,7 @@
   "news": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.news"
   },
   "next": {
     "_type": "newgtld",
@@ -4082,7 +4083,7 @@
   "ninja": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.ninja"
   },
   "nissan": {
     "_group": "gmo",
@@ -4335,12 +4336,12 @@
   "partners": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.partners"
   },
   "parts": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.parts"
   },
   "party": {
     "_type": "newgtld",
@@ -4408,12 +4409,12 @@
   "photography": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.photography"
   },
   "photos": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.photos"
   },
   "physio": {
     "_group": "aridnrs",
@@ -4436,7 +4437,7 @@
   "pictures": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.pictures"
   },
   "pid": {
     "_type": "newgtld",
@@ -4464,7 +4465,7 @@
   "pizza": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.pizza"
   },
   "pk": {
     "adapter": "web",
@@ -4479,7 +4480,7 @@
   "place": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.place"
   },
   "play": {
     "_group": "google",
@@ -4494,12 +4495,12 @@
   "plumbing": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.plumbing"
   },
   "plus": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.plus"
   },
   "pm": {
     "host": "whois.nic.pm"
@@ -4536,7 +4537,8 @@
     "host": "whois.dotpostregistry.net"
   },
   "pr": {
-    "host": "whois.nic.pr"
+    "_group": "afiliassrs",
+    "host": "whois.afilias-srs.net"
   },
   "pramerica": {
     "_type": "newgtld",
@@ -4566,7 +4568,7 @@
   "productions": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.productions"
   },
   "prof": {
     "_group": "google",
@@ -4586,7 +4588,7 @@
   "properties": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.properties"
   },
   "property": {
     "_group": "uniregistry",
@@ -4615,7 +4617,7 @@
   "pub": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.pub"
   },
   "pw": {
     "host": "whois.nic.pw"
@@ -4684,7 +4686,7 @@
   "recipes": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.recipes"
   },
   "red": {
     "_group": "afilias",
@@ -4704,7 +4706,7 @@
   "rehab": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.rehab"
   },
   "reise": {
     "_type": "newgtld",
@@ -4713,7 +4715,7 @@
   "reisen": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.reisen"
   },
   "reit": {
     "_type": "newgtld",
@@ -4736,22 +4738,22 @@
   "rentals": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.rentals"
   },
   "repair": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.repair"
   },
   "report": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.report"
   },
   "republican": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.republican"
   },
   "rest": {
     "_group": "centralnic",
@@ -4761,7 +4763,7 @@
   "restaurant": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.restaurant"
   },
   "review": {
     "_type": "newgtld",
@@ -4770,7 +4772,7 @@
   "reviews": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.reviews"
   },
   "rexroth": {
     "_type": "newgtld",
@@ -4807,7 +4809,7 @@
   "rip": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.rip"
   },
   "rmit": {
     "_group": "aridnrs",
@@ -4824,7 +4826,7 @@
   "rocks": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.rocks"
   },
   "rodeo": {
     "_group": "mmregistry",
@@ -4867,7 +4869,7 @@
   "run": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.run"
   },
   "rw": {
     "host": "whois.ricta.org.rw"
@@ -4904,12 +4906,12 @@
   "sale": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.sale"
   },
   "salon": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.salon"
   },
   "samsclub": {
     "_type": "newgtld",
@@ -4942,7 +4944,7 @@
   "sarl": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.sarl"
   },
   "sas": {
     "_type": "newgtld",
@@ -4999,12 +5001,12 @@
   "school": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.school"
   },
   "schule": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.schule"
   },
   "schwarz": {
     "_type": "newgtld",
@@ -5072,7 +5074,7 @@
   "services": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.services"
   },
   "ses": {
     "_type": "newgtld",
@@ -5138,7 +5140,7 @@
   "shoes": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.shoes"
   },
   "shop": {
     "_type": "newgtld",
@@ -5147,7 +5149,7 @@
   "shopping": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.shopping"
   },
   "shouji": {
     "_group": "teleinfo",
@@ -5157,7 +5159,7 @@
   "show": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.show"
   },
   "showtime": {
     "_group": "afiliassrs",
@@ -5185,7 +5187,7 @@
   "singles": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.singles"
   },
   "site": {
     "_group": "centralnic",
@@ -5227,8 +5229,9 @@
     "host": "whois.nic.sm"
   },
   "smart": {
+    "_group": "centralnic",
     "_type": "newgtld",
-    "host": "whois-gtld.smart.com.ph"
+    "host": "whois.nic.smart"
   },
   "smile": {
     "_group": "amazonregistry",
@@ -5249,12 +5252,12 @@
   "soccer": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.soccer"
   },
   "social": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.unitedtld.com"
+    "host": "whois.nic.social"
   },
   "softbank": {
     "_type": "newgtld",
@@ -5263,7 +5266,7 @@
   "software": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.software"
   },
   "sohu": {
     "_type": "newgtld",
@@ -5272,12 +5275,12 @@
   "solar": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.solar"
   },
   "solutions": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.solutions"
   },
   "song": {
     "_group": "amazonregistry",
@@ -5303,6 +5306,10 @@
     "_type": "newgtld",
     "host": "whois.ksregistry.net"
   },
+  "sport": {
+    "_type": "newgtld",
+    "host": "whois.nic.sport"
+  },
   "spot": {
     "_group": "amazonregistry",
     "_type": "newgtld",
@@ -5390,7 +5397,7 @@
   "studio": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.studio"
   },
   "study": {
     "_type": "newgtld",
@@ -5399,7 +5406,7 @@
   "style": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.style"
   },
   "su": {
     "host": "whois.tcinet.ru"
@@ -5411,17 +5418,17 @@
   "supplies": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.supplies"
   },
   "supply": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.supply"
   },
   "support": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.support"
   },
   "surf": {
     "_group": "mmregistry",
@@ -5431,7 +5438,7 @@
   "surgery": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.surgery"
   },
   "suzuki": {
     "_type": "newgtld",
@@ -5470,7 +5477,7 @@
   "systems": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.systems"
   },
   "sz": {
     "adapter": "none"
@@ -5512,12 +5519,12 @@
   "tax": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.tax"
   },
   "taxi": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.taxi"
   },
   "tc": {
     "host": "whois.nic.tc"
@@ -5538,7 +5545,7 @@
   "team": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.team"
   },
   "tech": {
     "_group": "centralnic",
@@ -5548,7 +5555,7 @@
   "technology": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.technology"
   },
   "tel": {
     "host": "whois.nic.tel"
@@ -5570,7 +5577,7 @@
   "tennis": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.tennis"
   },
   "teva": {
     "_type": "newgtld",
@@ -5593,7 +5600,7 @@
   "theater": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.theater"
   },
   "theatre": {
     "_group": "centralnic",
@@ -5612,7 +5619,7 @@
   "tienda": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.tienda"
   },
   "tiffany": {
     "_type": "newgtld",
@@ -5624,12 +5631,12 @@
   "tips": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.tips"
   },
   "tires": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.tires"
   },
   "tirol": {
     "_type": "newgtld",
@@ -5673,7 +5680,7 @@
   "today": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.today"
   },
   "tokyo": {
     "_type": "newgtld",
@@ -5682,7 +5689,7 @@
   "tools": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.tools"
   },
   "top": {
     "_type": "newgtld",
@@ -5705,12 +5712,12 @@
   "tours": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.tours"
   },
   "town": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.town"
   },
   "toyota": {
     "_type": "newgtld",
@@ -5719,7 +5726,7 @@
   "toys": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.toys"
   },
   "tr": {
     "host": "whois.nic.tr"
@@ -5735,7 +5742,7 @@
   "training": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.training"
   },
   "travel": {
     "host": "whois.nic.travel"
@@ -5866,7 +5873,7 @@
   "university": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.university"
   },
   "uno": {
     "_type": "newgtld",
@@ -5901,7 +5908,7 @@
   "vacations": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.vacations"
   },
   "vana": {
     "_type": "newgtld",
@@ -5926,7 +5933,7 @@
   "ventures": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.ventures"
   },
   "verisign": {
     "_type": "newgtld",
@@ -5939,7 +5946,7 @@
   "vet": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.vet"
   },
   "vg": {
     "host": "whois.nic.vg"
@@ -5951,12 +5958,12 @@
   "viajes": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.viajes"
   },
   "video": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.rightside.co"
+    "host": "whois.nic.video"
   },
   "vig": {
     "_group": "afiliassrs",
@@ -5971,12 +5978,12 @@
   "villas": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.villas"
   },
   "vin": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.vin"
   },
   "vip": {
     "_group": "mmregistry",
@@ -5994,7 +6001,7 @@
   "vision": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.vision"
   },
   "vista": {
     "_type": "newgtld",
@@ -6052,7 +6059,7 @@
   "voyage": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.voyage"
   },
   "vu": {
     "host": "vunic.vu"
@@ -6090,7 +6097,7 @@
   "watch": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.watch"
   },
   "watches": {
     "_type": "newgtld",
@@ -6164,7 +6171,7 @@
   "wine": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.wine"
   },
   "winners": {
     "_type": "newgtld",
@@ -6192,12 +6199,12 @@
   "works": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.works"
   },
   "world": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.world"
   },
   "wow": {
     "_group": "amazonregistry",
@@ -6214,7 +6221,7 @@
   "wtf": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.wtf"
   },
   "xbox": {
     "_type": "newgtld",
@@ -6418,7 +6425,7 @@
   "xn--czrs0t": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.xn--czrs0t"
   },
   "xn--czru2d": {
     "_group": "knet",
@@ -6476,7 +6483,7 @@
   "xn--fjq720a": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.xn--fjq720a"
   },
   "xn--flw351e": {
     "_group": "google",
@@ -6708,6 +6715,9 @@
   "xn--ogbpf8fl": {
     "host": "whois.tld.sy"
   },
+  "xn--otu796d": {
+    "adapter": "none"
+  },
   "xn--p1acf": {
     "_type": "newgtld",
     "host": "whois.nic.xn--p1acf"
@@ -6776,7 +6786,7 @@
   "xn--unup4y": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.xn--unup4y"
   },
   "xn--vermgensberater-ctb": {
     "_group": "ksregistry",
@@ -6791,7 +6801,7 @@
   "xn--vhquv": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.xn--vhquv"
   },
   "xn--vuq861b": {
     "_group": "ngtld",
@@ -6955,7 +6965,7 @@
   "zone": {
     "_group": "donuts",
     "_type": "newgtld",
-    "host": "whois.donuts.co"
+    "host": "whois.nic.zone"
   },
   "zuerich": {
     "_group": "ksregistry",
@@ -6965,4 +6975,4 @@
   "zw": {
     "adapter": "none"
   }
-}
+}