More Makefile tweaking
Merge branch 'unstable-jumbo' into bleeding-jumbo

* unstable-jumbo:
  More Makefile tweaking