bavieca from git://git.code.sf.net/p/bavieca/code