Con 2326

@wladekb could you take a look?