--- /usr/lib/perl5/vendor_perl/Slim/Plugin/iTunes/Importer.pm	2008-01-22 20:58:31.000000000 +0100
+++ /opt/McShare/Importer.pm	2008-03-02 13:48:46.000000000 +0100
@@ -24,6 +24,9 @@
 use Slim::Utils::Misc;
 use Slim::Utils::Strings qw(string);
 use Slim::Utils::Prefs;
+use Unicode::Normalize;
+use Encode 'decode_utf8';
+
 
 my $lastMusicLibraryFinishTime = undef;
 my $lastITunesMusicLibraryDate = 0;
@@ -233,9 +236,14 @@
 	my $file;
 
 	if (Slim::Music::Info::isFileURL($url)) {
-
-		$file  = Slim::Utils::Misc::pathFromFileURL($url);
-
+            
+                # Bug 5539
+#            
+#		$file  = Slim::Utils::Misc::pathFromFileURL($url);
+                $file = substr $url, 7;
+                $file =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
+                $file = Encode::decode_utf8($file);
+                
 		if ($] > 5.007 && $file && Slim::Utils::Unicode::currentLocale() ne 'utf8') {
 
 			eval { Encode::from_to($file, 'utf8', Slim::Utils::Unicode::currentLocale()) };
@@ -244,6 +252,22 @@
 				logError("[$@]");
 			}
 		}
+                
+                # Bug 5539
+                # iTunes uses decomposed utf-8 (on a MAC), which corresponds to the decomposed UTF-8 file path on an HFS+ volume.
+                # if the file is moved to a different path on an NFS or SMB file system (eg ReadyNAS), the path is automagically
+                # converted into composed utf-8. Both forms are tried here: the winning form survives ;=)
+                $log->debug ("Undecoded utf-8 file: $file");
+                $file = NFD($file);    # try decomposed form first
+                $log->debug ("Decomposed form of file path: $file");
+                if (-e $file) {
+                    $log->debug ("Decomposed UTF-8 file found: $file");
+                } else {
+                    $file = NFC ($file);
+                    if (-e $file) {
+                        $log->debug ("Composed UTF-8 file found: $file");
+                    }
+                }
 
 		# Bug 3402 
 		# If the file can't be found using itunes_library_music_path,