DESKADV: Update for upstream build system changes.