Imported Debian patch 2.0.2-4