By James Hibberd
June 27, 2011 at 07:30 PM EDT

For only the second time in her career as a geek goddess, Sarah Michelle Gellar is going to Comic-Con.

Gellar will star on The CW’s panel for her return to TV in the fall show Ringer. (For those who haven’t seen it yet, here’s the trailer.) She’ll take the stage along with co-stars Nestor Carbonell, Ioan Gruffudd, Kristoffer Polaha, and the show’s creative team. The panel will also give away a three-night stay in a luxurious hotel suite adjacent to Comic-Con (what every fan secretly wants — not posters or T-shirts, but the coveted hotel room upgrade).

The last time she was at the San Diego fan convention it was for her 2004 horror movie The Grudge. (Nope, not Buffy the Vampire Slayer.)

Here’s who else is going to Comic-Con this year.