This chapter describes the developments to control infectious diseases in the dairy cattle industry, and outlines recent research in this area. A risk analysis approach is presented as a framework for managing infectious diseases at global and farm level. Disease hazards, and the release and exposure of these, are also discussed. The importance of disease detection, the use of diagnostic tests, their appropriate interpretation and surveillance are highlighted. The range of impacts of infectious diseases on the dairy industry is described and guidelines to estimate and evaluate risks of infectious diseases are provided. In addition, the challenges around successful implementation and effective communication of risk management on dairy farms are reviewed.