merge from Uli Schlachter: policy callback + experimental Makefile + tiny fixes