I usually manage to remove water spots with wax - pretty much any kind. sometimes it takes several applications, though.