update for upstream changes in apache and apt