983: Fix for makefiles using querystrings
Merge pull request #984 from Decipher/983-make_format

983: Fix for makefiles using querystrings