Enhance defrouted

Signed-off-by: Julien Danjou <julien@danjou.info>