Accurate measurement of shipbuilding capacity is critical to inform market stakeholders of excess capacity issues. This report presents several approaches to improve the estimates of shipbuilding capacity. It shows how the use of average production would allow for smoothening the proxy of capacity in the yard-by-yard production approach. It discusses how firm level indicators, such as productivity, can also be considered. An analysis of productivity developments for a sample of shipbuilding firms shows that their productivity evolves in function of the market situation which, therefore, should be taken into account in the proxies of capacity based on yard production. Finally, the report studies how mergers and acquisitions of shipbuilding firms may impact capacity.