Dyspepsia is a common clinical problem with an extensive differential diagnosis and a heterogeneous pathophysiology. Dyspepsia affects up to 40 % of the general population and significantly reduces quality of life. According to the Rome III criteria, dyspepsia is defined as one or more of the following symptoms: epigastric pain and/or burning (classified as epigastric pain syndrome), postprandial fullness and/or early satiation (classified as postprandial distress syndrome). Initial evaluation should focus on the identification and treatment of potential causes of symptoms such as gastroesophageal reflux disease, peptic ulcer disease, and medication side effects but also on recognizing those at risk for more serious conditions such as gastric cancer. An empiric PPI trial or "test and treat" strategy for Helicobacter pylori are the initial approaches to a patient with dyspepsia, followed by endoscopy if initial management fails. Once an organic cause for symptoms is excluded, a diagnosis of functional dyspepsia is made. This article will review the definition, etiology, and general approach to the evaluation and management of the patient with dyspepsia including the role of proton-pump inhibitors, treatment of Helicobacter pylori, and endoscopy.