Non-variceal gastrointestinal bleeding (GIB) is a significant cause of mortality and morbidity worldwide which is encountered in the ambulatory and hospital settings. Hemorrhage form the gastrointestinal (GI) tract is categorized as upper GIB, small bowel bleeding (also formerly referred to as obscure GIB) or lower GIB. Although the etiologies of GIB are variable, a strong, consistent risk factor is use of non-steroidal anti-inflammatory drugs. Advances in the endoscopic diagnosis and treatment of GIB have led to improved outcomes. We present an updated review of the current practices regarding the diagnosis and management of non-variceal GIB, and possible future directions.