Keep in sync and add new content from upstream