updated from vserver-djinni