diff --git a/config.def.h b/config.def.h
index 0866e35bd..6dfb6d2bc 100644
--- a/config.def.h
+++ b/config.def.h
@@ -635,62 +635,62 @@ static const bool ui_companion_enable = false;
 
 #if defined(ANDROID)
 #if defined(ANDROID_ARM)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
+static char buildbot_server_url[] = "";
 #elif defined(ANDROID_AARCH64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/";
+static char buildbot_server_url[] = "";
 #elif defined(ANDROID_X86)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86/";
+static char buildbot_server_url[] = "";
 #else
 static char buildbot_server_url[] = "";
 #endif
 #elif defined(__QNX__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/blackberry/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(IOS)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ios/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(OSX)
 #if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
-static char buildbot_server_url[] = "http://bot.libretro.com/nightly/apple/osx/x86/latest/";
+static char buildbot_server_url[] = "";
 #else
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/";
+static char buildbot_server_url[] = "";
 #endif
 #elif defined(_WIN32) && !defined(_XBOX)
 #if _MSC_VER == 1600
 #if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/";
+static char buildbot_server_url[] = "";
 #endif
 #elif _MSC_VER == 1400
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/";
+static char buildbot_server_url[] = "";
 #elif _MSC_VER == 1310
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
+static char buildbot_server_url[] = "";
 #else
 #if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86_64/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86/latest/";
+static char buildbot_server_url[] = "";
 #endif
 #endif
 #elif defined(__linux__)
 #if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86_64/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(__arm__) && __ARM_ARCH == 7 && defined(__ARM_PCS_VFP)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/armhf/latest/";
+static char buildbot_server_url[] = "";
 #else
 static char buildbot_server_url[] = "";
 #endif
 #elif defined(WIIU)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
+static char buildbot_server_url[] = "";
 #elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/dex-ps3/";
+static char buildbot_server_url[] = "";
 #elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/cex-ps3/";
+static char buildbot_server_url[] = "";
 #elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/ode-ps3/";
+static char buildbot_server_url[] = "";
 #else
 static char buildbot_server_url[] = "";
 #endif
@@ -695,6 +695,6 @@ static char buildbot_server_url[] = "";
 static char buildbot_server_url[] = "";
 #endif
 
-static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";
+static char buildbot_assets_server_url[] = "";
 
 #endif
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index dfd8b448c..5d12fef83 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -413,7 +413,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
 #if TARGET_OS_IPHONE
     char assets_zip_path[PATH_MAX_LENGTH];
     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));
+       strlcpy(g_defaults.path.buildbot_server_url, "", sizeof(g_defaults.path.buildbot_server_url));
 
     fill_pathname_join(assets_zip_path, bundle_path_buf, "assets.zip", sizeof(assets_zip_path));
     
diff --git a/libretro-common/samples/net/net_http_test.c b/libretro-common/samples/net/net_http_test.c
index 92d1cdec0..aa4f53d7c 100644
--- a/libretro-common/samples/net/net_http_test.c
+++ b/libretro-common/samples/net/net_http_test.c
@@ -37,7 +37,7 @@ int main(void)
    if (!network_init())
       return -1;
 
-   http1 = net_http_new("http://buildbot.libretro.com/nightly/win-x86/latest/mednafen_psx_libretro.dll.zip");
+   http1 = net_http_new("");
 
    while (!net_http_update(http1, &pos, &tot))
       printf("%.9lu / %.9lu        \r",pos,tot);
diff --git a/retroarch.cfg b/retroarch.cfg
index 990783191..91e6f2c11 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -738,13 +738,13 @@
 #### Core Updater
 
 # URL to core update directory on buildbot.
-# core_updater_buildbot_url = "http://buildbot.libretro.com"
+core_updater_buildbot_url = ""
 
 # URL to assets update directory on buildbot.
-# core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/"
+core_updater_buildbot_assets_url = ""
 
 # After downloading, automatically extract archives that the downloads are contained inside.
-# core_updater_auto_extract_archive = true
+core_updater_auto_extract_archive = false
 
 #### Network