Imported Debian patch 1.0.1h-2