This patch from yesterday either disappear or never made it, anyway, recommiting jinmei's code (reviewed on jabber by, er, me)