I finished renaming the major makes, and included them in the "automatic origin" function ( www.imcdb.org/temp/auto-origin.txt )
Still 1549 vehicles without countries, but "only" 656 that are not "unknown" make (i.e. the 900 others are unknown vehicle anyway, and will get a country when they will get a make).