Imported Debian patch 1.0.1f-1ubuntu2