DGD for MSys, mark 2

This patch applies the same way as the other does. Please bear in mind
that this patch DEPENDS on the previous one, so if you're applying
this one you must first apply the other. And here's the new-new patch: