Minor changes, to revert to dbuild 0.9.1
Merge pull request #1 from cunei/revert-to-0.9.1

Some more changes, to use dbuild 0.9.1