Updated to support ArchLinux