I tried to use the wizzard, it asked me nicely if I wanted to change the data connections to the new location. The problem was that it didnt take the whole link, it went from oldserver/sites/oldsitecollection to newserver/newsitecollection, it forgot the /sites/ part.
Also the hacking of the manifest files doesnt sound like a viable solution to ...