Backported by Thanatermesis for E17: Conflicts: data/etc/Makefile.mk Fixed the old Makefile.am one instead