diff --git a/archive.sh b/archive.sh
index ac7c343..8295b98 100755
--- a/archive.sh
+++ b/archive.sh
@@ -4,7 +4,7 @@ make cleanall
 make dir DIR=./media
 cd linux
 make todaytar DIR=.
-mv -f linux-media-LATEST.tar.* ..
+mv -f linux-media.tar.* ..
 
 echo "V4L firmwares archive..."
 cd ../v4l/firmware
diff --git a/build b/build
index 33873f8..58d6b5b 100755
--- a/build
+++ b/build
@@ -22,8 +22,8 @@ my @git;
 
 my $main_git_url = "https://github.com/tbsdtv/linux_media.git";
 my $main_branch = "latest";
-my $firmware_url = "http://www.tbsdtv.com/download/document/linux/";
-my $firmware_tarball = "tbs-tuner-firmwares_v1.0.tar.bz2";
+my $firmware_url = "https://github.com/tbsdtv/media_build/releases/download/latest";
+my $firmware_tarball = "dvb-firmwares.tar.bz2";
 
 GetOptions('v|verbose' => \$level,
 	   'help|?' => \$help,
@@ -521,7 +521,7 @@ if (@git == 2) {
 	print "****************************\n";
 	print "Updating the building system\n";
 	print "****************************\n";
-	system("git pull https://github.com/tbsdtv/linux_media.git master");
+	system("git pull https://github.com/tbsdtv/media_build.git master");
 
 	run("make -C linux/ download", "Download failed");
 	run("make -C linux/ untar", "Untar failed");
diff --git a/linux/Makefile b/linux/Makefile
index a933a84..fdd5683 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -64,8 +64,8 @@ DATE := `git --git-dir $(DIR)/.git log -n1 '--pretty=format:%h %ai' |perl -ne 'p
 #TODAY_TAR := linux-media-${DATE}.tar
 TODAY_TAR := linux-media.tar
 TODAY_TAR_MD5 := ${TODAY_TAR}.bz2.md5
-LATEST_TAR := http://www.tbsdtv.com/download/document/linux/linux-media-LATEST.tar.bz2
-LATEST_TAR_MD5 := http://www.tbsdtv.com/download/document/linux/linux-media-LATEST.tar.bz2.md5
+LATEST_TAR := https://github.com/tbsdtv/media_build/releases/download/latest/linux-media.tar.bz2
+LATEST_TAR_MD5 := https://github.com/tbsdtv/media_build/releases/download/latest/linux-media.tar.bz2.md5
 
 default:
 	make -C ..