Use old, ugly way to add new partitions. The method we used since 5.1 has been a bit buggy.
Merge branch 'master' into debian
6.0.1-1