Keep up with upstream