diff --git a/src/whois.am.php b/src/whois.am.php
new file mode 100644
index 0000000..116992a
--- /dev/null
+++ b/src/whois.am.php
@@ -0,0 +1,42 @@
+<?php
+if (!defined('__AM_HANDLER__'))
+	define('__AM_HANDLER__', 1);
+
+require_once('whois.parser.php');
+
+class am_handler
+	{
+	function parse($data_str, $query)
+		{
+		$items = array(
+                'owner' 			=> 'Registrant:',
+                'domain.name' 		=> 'Domain name:',
+                'domain.created' 	=> 'Registered:',
+                'domain.changed' 	=> 'Last modified:',
+                'domain.nserver' 	=> 'DNS servers:',
+                'domain.status'		=> 'Status:',
+                'tech' 				=> 'Technical contact:',
+                'admin'				=> 'Administrative contact:',
+		            );
+
+		$r['regrinfo'] = get_blocks($data_str['rawdata'], $items);
+
+		if (!empty($r['regrinfo']['domain']['name']))
+			{
+			$r['regrinfo'] = get_contacts($r['regrinfo'],$trans);
+			$r['regrinfo']['registered'] = 'yes';
+			}
+		else
+			{
+			$r = '';
+			$r['regrinfo']['registered'] = 'no';
+			}
+
+		$r['regyinfo'] = array(
+                    'referrer' => 'http://www.isoc.am',
+                    'registrar' => 'ISOCAM'
+                    );
+
+		return $r;
+		}
+	}
diff --git a/test.txt b/test.txt
index 5240c2d..9c0b536 100644
--- a/test.txt
+++ b/test.txt
@@ -2,6 +2,7 @@
 
 ae		nic.ae
 ag		nic.ag
+am		isoc.am
 at		nic.at
 au		telstra.com.au
 be		nic.be