Bug 1003711 - Part 4: Add dss and dss-setup