update source tree, fix -current compilation for i386