Unbreak apache2 and update to 2.2.25