Bug#816607: Partial patch

[Mathieu Malaterre]

This does not qualify as `tag patch` but since it does improve
slightly the situation, I am posting it here for reference.

bug816607.patch
Description: Binary data