issue patch against v3.5.4 (along with ArchLinux PKGBUILD)