zathura and girara updates are in CVS.