---
 library/SimplePie/Enclosure.php |    8 ++------
 library/SimplePie/File.php      |    8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

--- a/library/SimplePie/Enclosure.php
+++ b/library/SimplePie/Enclosure.php
@@ -251,12 +251,8 @@ class SimplePie_Enclosure
 		$this->type = $type;
 		$this->width = $width;
 
-		if (class_exists('idna_convert'))
-		{
-			$idn = new idna_convert();
-			$parsed = SimplePie_Misc::parse_url($link);
-			$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
-		}
+		$parsed = SimplePie_Misc::parse_url($link);
+		$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], idn_to_utf8($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
 		$this->handler = $this->get_handler(); // Needs to load last
 	}
 
--- a/library/SimplePie/File.php
+++ b/library/SimplePie/File.php
@@ -67,12 +67,8 @@ class SimplePie_File
 
 	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $curl_options = array())
 	{
-		if (class_exists('idna_convert'))
-		{
-			$idn = new idna_convert();
-			$parsed = SimplePie_Misc::parse_url($url);
-			$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], NULL);
-		}
+		$parsed = SimplePie_Misc::parse_url($url);
+		$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], idn_to_utf8($parsed['authority']), $parsed['path'], $parsed['query'], NULL);
 		$this->url = $url;
 		$this->permanent_url = $url;
 		$this->useragent = $useragent;