PROBLEM TO BE SOLVED: To provide an infusion or self-injection device with an end-of-dose indicator.SOLUTION: A device (100) for delivering a medicament into a patients body by injection into or through the patients skin includes a body (104, 116) having a reservoir (160) disposed therein for containing the medicament, an injection needle (152) for penetrating the skin of the patient, the patient needle (152) having a lumen and communicating with the reservoir (160), and a pressurizing system for pressurizing the reservoir (160). The device also includes indicator means (124) visible from outside the device (100) for indicating that delivery of the medicament is substantially complete.