diff --git a/Changes.md b/Changes.md
index 4ee67ab..8e44842 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,5 +1,6 @@
 2008/06/11
 		- fixed .cz handler registered date
+		- fixed .fr handler
 
 2008/05/28
 		- added handler for .it
diff --git a/src/whois.fr.php b/src/whois.fr.php
index 79c2f2e..30edbd6 100644
--- a/src/whois.fr.php
+++ b/src/whois.fr.php
@@ -58,16 +58,22 @@ class fr_handler
 						'zone-c' 	=> 'zone'
 		                  );
 
-		$r = generic_parser_a($data_str['rawdata'], $translate, $contacts, 'domain','dmY');
+		$reg = generic_parser_a($data_str['rawdata'], $translate, $contacts, 'domain','dmY');
 
-		if (isset($r['domain']['holder']))
+		if (isset($reg['domain']['holder']))
 			{
-			$r['owner']['organization'] = $r['domain']['holder'];
-			unset($r['domain']['holder']);
-			$r['owner']['address'] = $r['domain']['address'];
-			unset($r['domain']['address']);
+			$reg['owner']['organization'] = $reg['domain']['holder'];
+			unset($reg['domain']['holder']);
+			$reg['owner']['address'] = $reg['domain']['address'];
+			unset($reg['domain']['address']);
 			}
 
+		$r['regrinfo'] = $reg;
+		$r['regyinfo'] = array(
+                          'referrer' => 'http://www.nic.fr',
+                          'registrar' => 'AFNIC'
+                          );
+
 		return ($r);
 		}
 	}