diff --git a/src/whois.servers.php b/src/whois.servers.php
index 8ae249f..643d552 100644
--- a/src/whois.servers.php
+++ b/src/whois.servers.php
@@ -247,7 +247,6 @@ $this->WHOIS_NON_ICANN = array (
 		'viagem'	=> 'http://www.new.net/search_whois.tp?domain={domain}&tld={tld}',
 		'video'		=> 'http://www.new.net/search_whois.tp?domain={domain}&tld={tld}',
 		'voyage'	=> 'http://www.new.net/search_whois.tp?domain={domain}&tld={tld}',
-		'xxx'		=> 'http://www.new.net/search_whois.tp?domain={domain}&tld={tld}',
 		'z'			=> 'http://www.adns.net/whois.php?txtDOMAIN={domain}.{tld}'
 		);
 ?>
diff --git a/src/whois.xxx.php b/src/whois.xxx.php
new file mode 100644
index 0000000..f7ecf70
--- /dev/null
+++ b/src/whois.xxx.php
@@ -0,0 +1,47 @@
+<?php
+/*
+Whois.php        PHP classes to conduct whois queries
+
+Copyright (C)1999,2005 easyDNS Technologies Inc. & Mark Jeftovic
+
+Maintained by David Saez
+
+For the most recent version of this package visit:
+
+http://www.phpwhois.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+if (!defined('__XXX_HANDLER__'))
+	define('__XXX_HANDLER__', 1);
+
+require_once('whois.parser.php');
+
+class xxx_handler
+	{
+	function parse($data_str, $query)
+		{
+		$r['regrinfo'] = generic_parser_b($data_str['rawdata']);
+
+		if (!strncmp($data_str['rawdata'][0], 'WHOIS LIMIT EXCEEDED', 20))
+			$r['regrinfo']['registered'] = 'unknown';
+
+		$r['regyinfo']['referrer'] = 'http://www.pir.org/';
+		$r['regyinfo']['registrar'] = 'Public Interest Registry';
+		return $r;
+		}
+	}
+?>
\ No newline at end of file
diff --git a/test.txt b/test.txt
index c11ecbb..6503da1 100644
--- a/test.txt
+++ b/test.txt
@@ -44,8 +44,8 @@ uk		olsns.co.uk
 us		neustar.us
 ve		nic.ve
 ws		samoanic.ws surf.ws
-.co.za	sex.co.za
-.org.za	sex.org.za
+.co.za		sex.co.za
+.org.za		sex.org.za
 
 // .com/.net/.tv/.jobs
 
@@ -90,31 +90,32 @@ rrpproxy	rrpproxy.net
 schlund		schlund.com
 srsplus		olsns.com
 namevault	namevault.com
-tmagnic     antiquea.com
+tmagnic     	antiquea.com
 tvcorp		www.tv
 wwdomains	wildwestdomains.com
 corporatedomains	cscglobal.com
 
 // Other
 
-aero	nic.aero
-asia	nic.asia
+aero		nic.aero
+asia		nic.asia
 biz		neulevel.biz
 cat		dominis.cat
-coop	smile.coop nic.coop
+coop		smile.coop nic.coop
 edu		berkeley.edu
 eu		eurid.eu
-info	afilias.info
+info		afilias.info
 int		who.int
 me		domain.me
-mobi	mtld.mobi
-museum	nic.museum
-name	peter.morgan.name
+mobi		mtld.mobi
+museum		nic.museum
+name		peter.morgan.name
 org		example.org
 pro		registrypro.pro
 tel		nic.tel
-travel	whois.travel
-za.net	sex.za.net
+travel		whois.travel
+xxx		nic.xxx
+za.net		sex.za.net
 
 // IP whois