--- a/upmpd/avtransport.cxx
+++ b/upmpd/avtransport.cxx
@@ -257,7 +257,7 @@
         chgdata += "<";
         chgdata += it->first;
         chgdata += " val=\"";
-        chgdata += xmlquote(it->second);
+        chgdata += SoapArgs::xmlQuote(it->second);
         chgdata += "\"/>\n";
     }
     chgdata += "</InstanceID>\n</Event>\n";
@@ -410,7 +410,7 @@
 
     const string& uri = mpds.currentsong.uri;
     if (is_song && !uri.empty()) {
-        data.addarg("TrackURI", xmlquote(uri));
+        data.addarg("TrackURI", SoapArgs::xmlQuote(uri));
     } else {
         data.addarg("TrackURI", "");
     }
@@ -474,7 +474,7 @@
 
     const string& thisuri = mpds.currentsong.uri;
     if (is_song && !thisuri.empty()) {
-        data.addarg("CurrentURI", xmlquote(thisuri));
+        data.addarg("CurrentURI", SoapArgs::xmlQuote(thisuri));
     } else {
         data.addarg("CurrentURI", "");
     }