I just went through this with Porter Cable 18V but I can't say it is the same for Ryobi. On the PC, all 18V batteries are interchangable on the tools, but the charging needs are different. A dedicated NiCad charger can't shouldn't be used for liOn but the later chargers will work for either battery.
Ryobi offers an 18V upgrade:
RYOBI Tools
882 views
Usually answered in minutes!
×