diff --git a/Changes.md b/Changes.md
index cd1317f..db5be40 100644
--- a/Changes.md
+++ b/Changes.md
@@ -2,7 +2,7 @@
 		- added handler for gandi (request #3155752)
 		- added handler for .cl
 		- corrected utf-8 support for .hu, .br and ripe
-		- fixes for .pl, .org.za, .be, .cz, .de handlers
+		- fixes for .pl, .org.za, .be, .cz, .de, .fj handlers
 
 2011/06/24
 		- fixed .be handler (bug #3307363)
diff --git a/src/whois.fj.php b/src/whois.fj.php
index 20d7123..b93b655 100644
--- a/src/whois.fj.php
+++ b/src/whois.fj.php
@@ -41,40 +41,32 @@ class fj_handler
 		$items = array(
 				'owner' => 'Registrant:',
 				'domain.status' => 'Status:',
-				'domain.name' => 'Domain name:',
 				'domain.expires' => 'Expires:',
 				'domain.nserver' => 'Domain servers:'
 		            );
 
 		$r['regrinfo'] = get_blocks($data_str['rawdata'], $items);
 
-		if (!empty($r['regrinfo']['domain']['name']))
+		if (!empty($r['regrinfo']['domain']['status']))
 			{
 			$r['regrinfo'] = get_contacts($r['regrinfo']);
-			
-			$r['regrinfo']['domain']['name'] = $r['regrinfo']['domain']['name'][0];
 		
 			date_default_timezone_set("Pacific/Fiji");
 
 			if (isset($r['regrinfo']['domain']['expires']))
 				$r['regrinfo']['domain']['expires'] = strftime("%Y-%m-%d",strtotime($r['regrinfo']['domain']['expires']));
 
-			$r['regyinfo'] = array(
-                          'referrer' => 'http://www.domains.fj',
-                          'registrar' => 'FJ Domain Name Registry'
-                          );
-
 			$r['regrinfo']['registered'] = 'yes';
 			}
 		else
-			{
-			$r = '';
 			$r['regrinfo']['registered'] = 'no';
-			}
 
-		return ($r);
+		$r['regyinfo'] = array(
+                         'referrer' => 'http://www.domains.fj',
+                         'registrar' => 'FJ Domain Name Registry'
+                         );
+		return $r;
 		}
-
 	}
 ?>
 
diff --git a/src/whois.servers.php b/src/whois.servers.php
index bcb5b55..7707331 100644
--- a/src/whois.servers.php
+++ b/src/whois.servers.php
@@ -82,7 +82,7 @@ $this->WHOIS_SPECIAL = array(
 		'bz'	 => 'whois2.afilias-grs.net',		
 		'cy'	 => '',
 		'es'	 => '',
-		//'fj'	 => 'whois.usp.ac.fj',
+		'fj'	 => 'whois.usp.ac.fj',
 		'fm'     => 'http://www.dot.fm/query_whois.cfm?domain={domain}&tld=fm',		
 		'jobs'	 => 'jobswhois.verisign-grs.com',
 		'ke'	 => 'kenic.or.ke',