diff --git a/Changes.md b/Changes.md
index 3b0e37d..cc8cd0e 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,6 +1,7 @@
 2011/08/07
 		- fixes for arin (bug #3339783)
 		- fixed .nl handler (bug #3314404)
+		- fixed .ae whois server (bug #3354286)
 
 2011/06/26
 		- added handler for gandi (request #3155752)
diff --git a/src/whois.ae.php b/src/whois.ae.php
index ca3e76c..9a4bfb0 100644
--- a/src/whois.ae.php
+++ b/src/whois.ae.php
@@ -35,48 +35,27 @@ require_once('whois.parser.php');
 
 class ae_handler
 	{
-
 	function parse($data_str, $query)
 		{
+		$items = array(
+                    'Domain Name:'		=> 'domain.name',
+                    'Registrar Name:'	=> 'domain.sponsor',
+                    'Status:'			=> 'domain.status',
+                    'Registrant Contact ID:'	=> 'owner.handle',
+                    'Registrant Contact Name:' => 'owner.name',
+                    'Tech Contact Name:'		=> 'tech.name',
+                    'Tech Contact ID:'			=> 'tech.handle',
+                    'Name Server:'		=> 'domain.nserver.'
+		              );
 
-		$translate = array(
-			'fax-no' 		=> 'fax',
-			'e-mail' 		=> 'email',
-			'nic-hdl' 		=> 'handle',
-			'person' 		=> 'name'
-			);
-
-		$contacts = array(
-                    'owner-c' => 'owner',
-                    'admin-c' => 'admin',
-                    'tech-c' => 'tech',
-                    'billing-c' => 'billing',
-                    'zone-c' => 'zone'
-		                );
+		$r['regrinfo'] = generic_parser_b($data_str['rawdata'], $items, 'ymd');
 
 		$r['regyinfo'] = array(
                     'referrer' => 'http://www.nic.ae',
                     'registrar' => 'UAENIC'
                     );
 
-		$reg = generic_parser_a($data_str['rawdata'], $translate, $contacts, 'domain', 'Ymd');
-
-		if (isset($reg['domain']['remarks']))
-			unset($reg['domain']['remarks']);
-
-		if (isset($reg['domain']['descr']))
-			{
-			$reg['owner'] = get_contact($reg['domain']['descr']);
-			unset($reg['domain']['descr']);			
-			}
-
-		if (!empty($reg['domain']['blacklisted']))
-			{
-			$reg['registered'] = 'unknown';
-			}
-
-		$r['regrinfo'] = $reg;
-		return ($r);
+		return $r;
 		}
 	}
 ?>
diff --git a/src/whois.servers.php b/src/whois.servers.php
index 7707331..bd20a99 100644
--- a/src/whois.servers.php
+++ b/src/whois.servers.php
@@ -68,7 +68,7 @@ $this->WHOIS_PARAM = array(
 
 $this->WHOIS_SPECIAL = array(
 		'ad'	 => '',
-		'ae'	 => 'whois.nic.ae',
+		'ae'	 => 'whois.aeda.net.ae',
 		'af'	 => 'whois.nic.af',
 		'ai'	 => 'http://whois.offshore.ai/cgi-bin/whois.pl?domain-name={domain}.ai',
 		'al'	 => '',