I forgot to mention gnu/local.mk in the commit message.  Please use
this patch attached here instead.

Regards,
Florian