Imported Debian patch 0.52-6