diff --git a/src/whois.gtld.nameintel.php b/src/whois.gtld.nameintel.php
new file mode 100644
index 0000000..d103715
--- /dev/null
+++ b/src/whois.gtld.nameintel.php
@@ -0,0 +1,64 @@
+<?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('__NAMEINTEL_HANDLER__'))
+	define('__NAMEINTEL_HANDLER__', 1);
+
+require_once('whois.parser.php');
+
+class nameintel_handler
+	{
+	function parse($data_str, $query)
+		{
+		$items = array(
+                  'owner' => 'Registrant Contact:',
+                  'admin' => 'Administrative Contact:',
+                  'tech' => 'Technical Contact',
+                  'domain.name' => 'Domain Name:',
+                  'domain.status' => 'Status:',
+                  'domain.nserver' => 'Name Server:',
+                  'domain.created' => 'Creation Date:',
+                  'domain.expires' => 'Expiration Date:'
+		              );
+
+		$r = easy_parser($data_str, $items, 'dmy', false, false, true);
+
+		if (isset($r['domain']['sponsor']) && is_array($r['domain']['sponsor']))
+			$r['domain']['sponsor'] = $r['domain']['sponsor'][0];
+
+		foreach($r as $key => $part)
+			{
+			if (isset($part['address']))
+				{
+				$r[$key]['organization'] = array_shift($r[$key]['address']);
+				$r[$key]['address']['country'] = array_pop($r[$key]['address']);
+				}
+			}
+		return $r;
+		}
+	}
+?>
diff --git a/test.txt b/test.txt
index c52b0bf..fee97c7 100644
--- a/test.txt
+++ b/test.txt
@@ -71,6 +71,7 @@ markmonitor	markmonitor.com
 melbourneit	inww.com
 moniker		moniker.com
 name		name.com
+nameintel	domaintools.com
 namejuice	namejuice.com
 nameking	nameking.com
 names4ever	names4ever.com