diff --git a/config.def.h b/config.def.h
index 3542daef17..61d99392c6 100644
--- a/config.def.h
+++ b/config.def.h
@@ -748,8 +748,6 @@ static char buildbot_server_url[] = "";
 #endif
 #elif defined(IOS)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ios/latest/";
-#elif defined(IOS9)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ios9/latest/";
 #elif defined(OSX)
 #if defined(__x86_64__)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/";
diff --git a/configuration.c b/configuration.c
index 974967972a..06a0e3092b 100644
--- a/configuration.c
+++ b/configuration.c
@@ -749,6 +749,9 @@ static void config_set_defaults(void)
    global->console.sound.mode = SOUND_MODE_NORMAL;
 #endif
 
+   if (*g_defaults.path.buildbot_server_url)
+      strlcpy(settings->network.buildbot_url,
+            g_defaults.path.buildbot_server_url, sizeof(settings->network.buildbot_url));
    if (*g_defaults.dir.wallpapers)
       strlcpy(settings->dynamic_wallpapers_directory,
             g_defaults.dir.wallpapers, sizeof(settings->dynamic_wallpapers_directory));
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index fff6bc839e..055044be87 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -376,6 +376,13 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
 #endif
 #endif
 
+#if TARGET_OS_IPHONE
+    int major, minor;
+    get_ios_version(&major, &minor);
+    if (major > 8)
+       strlcpy(g_defaults.path.buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/", sizeof(g_defaults.path.buildbot_server_url));
+#endif
+
    CFTemporaryDirectory(temp_dir, sizeof(temp_dir));
    strlcpy(g_defaults.dir.cache, temp_dir, sizeof(g_defaults.dir.cache));
 
diff --git a/general.h b/general.h
index 78f97b0a9d..77b823f9bf 100644
--- a/general.h
+++ b/general.h
@@ -107,6 +107,7 @@ struct defaults
    {
       char config[PATH_MAX_LENGTH];
       char core[PATH_MAX_LENGTH];
+      char buildbot_server_url[PATH_MAX_LENGTH];
    } path;
 
    struct