Giant Ichneumon Wasp

Description:

I'm thinking it's a male Megarhyssa macrurus, but I'd love confirmation from someone who knows what they're talking about. :]

Habitat:

Dry wooded area, trees 20-30 years old. Area recently cleared of bush honeysuckle (he's perching upon a cane, there)

Notes:

A week or so later I saw what I presume was the female flying about with that scary, scary, harmless ovipositor!