bring back the good changes overwritten in e3002df1 (make updatepo from SVN)