r1820: further debian improvements