Purpose The revised version of the Work Ability Survey (WAS-R) assesses work ability on several sub-scales at the intersection of personal and organizational capacity, thus adding to the measurement of work ability by integrating the holistic model. It, therefore, improves on two features of the current standard measurement tool of work ability, the Work Ability Index (WAI): (1) a ceiling effect and (2) limited detail due to a focus on physical health and personal capacity. Method In two samples (n₁ = 1093, n₂ = 359), psychometric properties and the structure of the WAS-R were analyzed. To evaluate construct validity, inter-correlations of the WAS-R and WAI, sickness absence, expected and desired retirement age, and post-retirement work intention were calculated. Results The WAS-R was found to be distributed closer to normality than the WAI. The structural analyses yielded acceptable results for the hypothesized model. The WAS-R was adequately correlated with the WAI, negatively with sickness absence, and positively with desired retirement age. Conclusions The WAS-R extends the measurement of work ability, reflecting organizations’ work demands. Its broad sub-scales lead to high acceptance of the results within the participating companies. In particular, the organizational capacity scales can be used to guide interventions aiming at organizational characteristics to improve work ability.