Imported Debian patch 2.0.1+dfsg-1