This article reviews the nomenclature, clinical and histological basis for a diagnosis of non-alcoholic fatty liver disease or non-alcoholic steatohepatitis, its natural history, pathophysiology and an approach to clinical management.