Patched fork of the d.o code