Merging with Ralf debianization