added 20h's patch of 8 Sep 2011 to surf, thanks