I used to use a product called Glas Wax. Haven't seen it a few years, and the last time was at Ace.
I'll also reccomend wiping with newspaper. Even using Windex, as long as wiping with newspaper, you'll get good results.