Focused ion beam (FIB) systems are commonly used to repair lithographic masks with features below one micron. We will summarize the development of focused ion beam mask repair systems starting from the original tools developed for photomasks approximately 10 years ago. The present state of the art in FIB mask repair systems is incorporated in two types of tools-one for repair of proximity print X-ray masks, and the other for repair of photomasks and some phase shift masks. Similarities of the two styles of systems include the gallium ion optics, the lithographic stage for accurate positioning, a thermal enclosure to minimize system drift, deflection and scanning electronics, and an interface to inspection data. The differences include the process chemistries, repair strategies, and imaging techniques. Examples of a variety of repaired defects on both X-ray and phase shift masks will be shown. Advanced masks such as those for EUV (Extreme Ultraviolet), DUV (Deep Ultraviolet), and SCALPEL (Scattering with Angular Limitation in Projection Electron Lithography) will have to be repaired should those technologies mature, and presumably with FIB tools. Preliminary research and development of advanced mask repair problems will be described and possible approaches will be suggested.