Bug#823785: Patch from Arch devs

[Phil Miller]

The same bug was reported on Arch Linux, with a patch produced:
https://bugs.archlinux.org/task/48772

Patch can be found here:
http://pkgbuild.com/~jgc/

I'll try it directly shortly.