Complete OBS changes started in 7bf10a5ef478edfd6fcab42cc63a8e1bd1d5e461 in Makefile.