Use the ding2.patch from this branch