The attached patch fixes:
http://sourceware.org/bugzilla/show_bug.cgi?id=5518

I'll be committing (or I guess pushing is a better term using git) it on 
Monday but here it is for anyone who wants to play with it early.

Nurdin.