frko.diff received from @fkooman by email