I am aware of the Amikit replacements but I'm avoiding them because I don't want it to leak again some day.
I believe the original batteries were Ni-Cd (nickel cadmium) and the ones sold by Amigakit are Ni-Mh (nickel metal hydride). From what I can gather the new batteries are much less likely to leak.
