Comment 8 for bug 502989

Err, sorry for the Makefile lines in the diff... I usually don't forget to
remove them :D