The prevalence of type 2 diabetes is increasing rapidly. In order to reduce the morbidity and mortality of type 2 diabetes, it is important to treat both hyperglycaemia and risk factors for cardiovascular disease. This means that diabetes care is becoming increasingly comprehensive and complicated. Studies in Norway show that diabetes care in general practice could be improved. The primary care system needs more resources and better organisation to be able to meet the demands for improved quality and more comprehensive care. We suggest more active use of nurses and other health care professionals, as well as changes in the remuneration system for general practitioners. Remuneration for an annual review of patients with diabetes will stimulate quality improvement work. The division of work between primary health care and hospital clinics should be clarified.