Update to timduru's latest sources.