If working tasks are carried out in inadequate conditions, workers with functional limitations may, over time, risk developing further disabilities. While several validated risk assessment methods exist for able-bodied workers, few studies have been carried out for workers with disabilities. This paper, which reports the findings of a Study funded by the Italian Ministry of Labor, describes a general methodology for the technical and organizational re-design of a worksite, based on risk assessment and irrespective of any worker disability. To this end, a sample of 16 workers, composed of people with mild and severe motor disabilities, was recruited. By using a mix of risk assessment methods and the ICF taxonomy, the worksite was re-designed for each individual worker in the study, and a prospective evaluation was carried out to check whether the new design would eliminate the risks.