cc @drq (?)

@opennet