I've tried to be consistent, using four or eight spaces to line up with existing code.
Instead of using Gentoo's patchset, uses Debian's. Gentoo's doesn't work anymore.