Here is a link to a simple, effective and cheap repair (with pictures)

http://au.geocities.com/ozbrick850/door-stay_fix.html

I did this myself on my own two front doors and once to a friend's car. I've done it alone twice but a helper is useful when guiding the door back onto the pins. Takes about 30-45 minutes and costs next to nothing. My oldest fix is two years and still works fine.
--
96 850T, Bilstein HD, IPD swaybars