Update went fine and I noticed that iTunes on my PC now shows the files available on my NAS (iTunes server).
With version 2.02 iTunes found the NAS but upon selection of the NAS it got stuck on scanning for files. This works fine with 2.03b1.
However, when controlling iTunes through the remote app on iPhone, the NAS share still gets stuck on scanning the files so the iTunes server still needs fixing.