Update to 3.0.6

Hi!

I've taken your work, incorporated Tony's update to 3.0.6 and polished everything. It compiles cleanly in pbuilder, is more or less lintian clean and save to merge.

Please merge all three branches, so that your repo is the canonical source until Jonas picks it up.