Have you calibrated the battery?
The first thing you do on any rechargeable-battery-driven device is to completely charge the battery, then let it *completely* drain, and then completely charge it again (some people swear this should be done three times, but from what I hear, once is enough).
If you don't do that, the charging hardware has no idea where the maximum and minimum battery capacity are, and can't adjust for that.
Battery life will usually be much improved if you calibrate the battery once when you get the device, and every two or three months afterwards.