Merge Debian stuff
It makes no sense to keep it in a seperate branch, the function is conditional