Keeping up with upstream changes