I've got a question about food supplies for emergencies.

Where I live, the major natural disaster risk is earthquakes so there probably will be zero warning. We're advised to keep 3 days food for the family that doesn't need cooking. I've stocked up on canned food which we rotate in and out (okay eating cold canned spaghetti isn't my idea of cordon bleu but as they say hunger is the best sauce). Also we have camp cooking equipment and a bbq. So I've been assuming the medley of stuff in our pantry would keep us going. But now I've decluttered my bedroom and the bathroom and the kids toys and I look at the pantry and apparently I have grown a declutter instinct.

How do you handle storing food for emergencies?

Also any ingenious ideas for stocking water would be appreciated.