sync a bit with debian
3.1.1