diff --git a/index.php b/index.php
index 38ec6c1..e57fc2b 100755
--- a/index.php
+++ b/index.php
@@ -21,10 +21,17 @@ function get_title_from_feed($url)
 function get_link_from_feed($url)
 	{
 	// get site link from feed
-		$validator = "http://validator.w3.org/feed/check.cgi";$validator .= "?url=".$url;$validator .= "&output=soap12";
-		$response = file_get_contents($validator);$a = strpos($response, '<m:validity>', 0)+12;$b = strpos($response, '</m:validity>', $a);$result = substr($response, $a, $b-$a);
-		if($result == "false") { die('le flux n\'a pas une syntaxe valide'); }
 	$data = file_get_contents("$url");
+	$xml = simplexml_load_string($data); // quick feed check
+	if (isset($xml->entry)) // ATOM feed.
+		{$result="true";}  
+	elseif (isset($xml->item)) // RSS 1.0 /RDF
+		{$result="true";} 
+	elseif (isset($xml->channel->item)) // RSS 2.0
+		{$result="true";} 
+	else
+		{$result="false";}
+ 		if($result == "false") { die('le flux n\'a pas une syntaxe valide'); }
 		$check = substr($data, 0, 5);
 		if($check !== '<?xml') { die('n\'est pas un flux valide'); }
 	$xml = new SimpleXmlElement($data);
diff --git a/xsaf2.php b/xsaf2.php
index 661c824..e2fc526 100755
--- a/xsaf2.php
+++ b/xsaf2.php
@@ -67,8 +67,15 @@ function xsafimport($xsafremote)
 					if ( mkdir('./'. $foldername, 0755, false) ) {
 		                $fp = fopen('./'. $foldername .'/index.php', 'w+');
 
-		$validator = "http://validator.w3.org/feed/check.cgi";$validator .= "?url=".$rssurl;$validator .= "&output=soap12";
-		$response = file_get_contents($validator);$a = strpos($response, '<m:validity>', 0)+12;$b = strpos($response, '</m:validity>', $a);$result = substr($response, $a, $b-$a);
+$xml = simplexml_load_file($rssurl); // quick feed check
+if (isset($xml->entry)) // ATOM feed.
+	{$result="true";}  
+elseif (isset($xml->item)) // RSS 1.0 /RDF
+	{$result="true";} 
+elseif (isset($xml->channel->item)) // RSS 2.0
+	{$result="true";} 
+else
+	{$result="false";} 
 
 /* autoblog */
 if($social==FALSE and $result!=="false")