Applied Wayne's patch for relocating the config files