I actually have a simpler solution which I've been following for some months now - drinking one tall glass of water everytime I feel thirsty. If you have small paper cups instead, then drink 3-4 of them. But drink enough so you may not need to drink for the next hour or so.

This way, I'm able to get in 7-8 glasses in a day (which is the usual prescribed limit).