Fix XSPF (Closes:#651)