Patched for Raspbmc recent config changes