diff --git a/amo-version.sh b/amo-version.sh
index 1d6e566..6f7bab3 100755
--- a/amo-version.sh
+++ b/amo-version.sh
@@ -1,4 +1,4 @@
 #! /usr/bin/env sh
 
-curl -s "https://addons.mozilla.org/api/v5/addons/addon/$1/versions/?page_size=1" | jq '.results | .[0] | .version' | tr -d '"'
+curl -s "https://addons.mozilla.org/api/v5/addons/addon/$1/versions/?page_size=1" | jq '.results | .[0] | .file | .url' | tr -d '"'
 
diff --git a/makefiles/extensions.mk b/makefiles/extensions.mk
index 36c90e7..1493a56 100644
--- a/makefiles/extensions.mk
+++ b/makefiles/extensions.mk
@@ -1,5 +1,5 @@
 
-build-extensions: build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
+build-extensions: extensions build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
 
 build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url
 	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
@@ -16,10 +16,10 @@ clean-extensions:
 extensions: HTTPSEverywhere.url NoScript.url i2psetproxy.url
 
 HTTPSEverywhere.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3809748/"`./amo-version.sh https-everywhere`"/https-everywhere-eff@eff.org.xpi" > HTTPSEverywhere.url
+	@echo `./amo-version.sh https-everywhere` > HTTPSEverywhere.url
 
 NoScript.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3534184/"`./amo-version.sh noscript`"/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" > NoScript.url
+	@echo `./amo-version.sh noscript` > NoScript.url
 
 i2psetproxy.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3887295/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
+	@echo `./amo-version.sh i2p-in-private-browsing` > i2psetproxy.url
diff --git a/makefiles/new-extensions.mk b/makefiles/new-extensions.mk
index 6e3535b..fb2ba4f 100644
--- a/makefiles/new-extensions.mk
+++ b/makefiles/new-extensions.mk
@@ -14,16 +14,16 @@ build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi:
 	curl -L `cat LocalCDN.url` > build//{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
 
 UBlockOrigin.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3892224/"`./amo-version.sh ublock-origin`"/uBlock0@raymondhill.net.xpi" > UBlockOrigin.url
+	@echo `./amo-version.sh ublock-origin` > UBlockOrigin.url
 
 JShelter.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3903890/"`./amo-version.sh javascript-restrictor`"/jsr@javascriptrestrictor.xpi" > JShelter.url
+	@echo "`./amo-version.sh javascript-restrictor`" > JShelter.url
 
 onioncontainer.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3904685/"`./amo-version.sh onion-in-container-browsing`"/onioncbt@eyedeekay.github.io.xpi" > onioncontainer.url
+	@echo `./amo-version.sh onion-in-container-browsing` > onioncontainer.url
 
 LocalCDN.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3902456/"`./amo-version.sh localcdn-fork-of-decentraleyes`"/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi" > LocalCDN.url
+	@echo `./amo-version.sh localcdn-fork-of-decentraleyes` > LocalCDN.url
 
 clean-new-extensions:
 	rm -f UBlockOrigin.url JShelter.url onioncontainer.url LocalCDN.url build/i2ppb@eyedeekay.github.io.xpi build/onioncbt@eyedeekay.github.io.xpi