sync with debian part 2