build: patch set 2