Merged with what's in the AUR, it's better than mine