diff --git a/WF b/WF
index 5dd3b00d..6fc42eb9 100644
--- a/WF
+++ b/WF
@@ -1,73 +1,50 @@
+% IANA WHOIS server
+% for more information on IANA, visit http://www.iana.org
+% This query returned 1 object
 
-IANA Whois Service
-Domain: wf
-ID: wf
+domain:       WF
 
-Sponsoring Organization:
-    Name: 
-    Organization: AFNIC (NIC France) - Immeuble International
-    Address1: 2 rue Stephenson - Montigny-le-Bretonneux
-    Address2: Saint-Quentin-en-Yvelines CEDEX
-    Address3: 
-    City: 
-    State/Province: 
-    Country: France
-    Postal Code: 78181
-    Phone: 
-    Fax: 
-    Email: 
-    Registration Date: 01-January-1985
-    Last Updated Date: 01-January-1985
+organisation: AFNIC (NIC France) - Immeuble International
+address:      2 rue Stephenson - Montigny-le-Bretonneux
+address:      Saint-Quentin-en-Yvelines CEDEX
+address:      78181
+address:      France
 
-Administrative Contact:
-    Name: AFNIC Admin Contact
-    Organization: AFNIC (NIC France) - Immeuble International
-    Address1: 2 rue Stephenson - Montigny-le-Bretonneux
-    Address2: Saint-Quentin-en-Yvelines CEDEX
-    Address3: 
-    City: 
-    State/Province: 
-    Country: France
-    Postal Code: 78181
-    Phone: +33 1 39 30 83 05
-    Fax: +33 1 39 30 83 01
-    Email: tld-admin@nic.fr
-    Registration Date: 01-January-1985
-    Last Updated Date: 15-March-2006
+contact:      administrative
+name:         AFNIC Admin Contact
+organisation: AFNIC (NIC France) - Immeuble International
+address:      2 rue Stephenson - Montigny-le-Bretonneux
+address:      Saint-Quentin-en-Yvelines CEDEX
+address:      78181
+address:      France
+phone:        +33 1 39 30 83 05
+fax-no:       +33 1 39 30 83 01
+e-mail:       tld-admin@nic.fr
 
-Technical Contact:
-    Name: AFNIC Tech Contact
-    Organization: AFNIC (NIC France) - Immeuble International
-    Address1: 2 rue Stephenson - Montigny-le-Bretonneux
-    Address2: Saint-Quentin-en-Yvelines CEDEX
-    Address3: 
-    City: 
-    State/Province: 
-    Country: France
-    Postal Code: 78181
-    Phone: +33 1 39 30 83 81
-    Fax: +33 1 39 30 83 01
-    Email: tld-tech@nic.fr
-    Registration Date: 01-January-1985
-    Last Updated Date: 15-March-2006
-URL for registration services: http://www.nic.wf/
-Whois Server (port 43): whois.nic.wf
+contact:      technical
+name:         AFNIC Tech Contact
+organisation: AFNIC (NIC France) - Immeuble International
+address:      2 rue Stephenson - Montigny-le-Bretonneux
+address:      Saint-Quentin-en-Yvelines CEDEX
+address:      78181
+address:      France
+phone:        +33 1 39 30 83 81
+fax-no:       +33 1 39 30 83 01
+e-mail:       tld-tech@nic.fr
 
-Nameserver Information:
-    Nameserver: a.nic.fr.
-    IP Address: 192.93.0.129 2001:660:3005:3:0:0:1:1
-    Nameserver: c.nic.fr.
-    IP Address: 192.134.0.129 2001:660:3006:4:0:0:1:1
-    Nameserver: d.ext.nic.fr.
-    IP Address: 192.5.4.2 2001:500:2e:0:0:0:0:2
-    Nameserver: d.nic.fr.
-    IP Address: 194.0.9.1 2001:678:c:1:0:0:0:1
-    Nameserver: e.ext.nic.fr.
-    IP Address: 193.176.144.6 2a00:d78:0:102:193:176:144:6
-    Nameserver: f.ext.nic.fr.
-    IP Address: 194.146.106.46
-    Nameserver: g.ext.nic.fr.
-    IP Address: 204.61.216.39 2001:500:14:6039:ad:0:0:1
+nserver:      A.NIC.FR 192.93.0.129 2001:660:3005:3:0:0:1:1
+nserver:      C.NIC.FR 192.134.0.129 2001:660:3006:4:0:0:1:1
+nserver:      D.EXT.NIC.FR 192.5.4.2 2001:500:2e:0:0:0:0:2
+nserver:      D.NIC.FR 194.0.9.1 2001:678:c:1:0:0:0:1
+nserver:      E.EXT.NIC.FR 193.176.144.6 2a00:d78:0:102:193:176:144:6
+nserver:      F.EXT.NIC.FR 194.146.106.46
+nserver:      G.EXT.NIC.FR 2001:500:14:6039:ad:0:0:1 204.61.216.39
+
+whois:        whois.nic.wf
+
+remarks:      Registration information: http://www.nic.wf/
+
+created:      1997-11-14
+changed:      2010-05-07
+source:       IANA
 
-Registration Date: 14-November-1997
-Last Updated Date: 07-May-2010