There is a product out named CLR. Ihave used it on glass shower door and it works. I bought it at walmart. CLR stands for calcium lime and rust.