- rel 6; rebuild with fixed macros