I suspected I did update metadoc.xml incorrectly. I checked out CVS and tested with my local system without problem so I don't know what happened. Please have a look.
I should have rechecked but as the patch applied 100%, I just committed as is. FYI, you put back 2005.0-upgrade-amd64.xml which had been removed. Fixed.