diff --git a/osx/build.sh b/osx/build.sh
index 47a0b3b..6ddcc82 100644
--- a/osx/build.sh
+++ b/osx/build.sh
@@ -1,6 +1,17 @@
-curl -O https://ftp.mozilla.org/pub/firefox/releases/52.5.0esr/mac/en-US/Firefox%2052.5.0esr.dmg
-hdiutil attach Firefox%2052.5.0esr.dmg
+version="52.5.0esr"
+
+echo "This script is preparing Firefox ESR $version for use with i2pd"
+echo "Downloading latest Firefox ESR..."
+curl --proto =https -L -f -# https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US
+echo "Attaching image..."
+hdiutil attach ./Firefox\ $version.dmg
+echo "Copying files..."
 cp -rf /Volumes/Firefox/Firefox.app ./FirefoxESR.app
 cp ./syspref.js ./FirefoxESR.app/Contents/Resources/defaults/pref/
-curl -O https://secure.informaction.com/download/releases/noscript-5.1.7.xpi
+echo "Detaching image and removing image file..."
+hdiutil detach /Volumes/Firefox
+rm ./Firefox\ $version.dmg
+echo "Downloading NoScript extension..."
+curl --proto =https -L -f -# https://secure.informaction.com/download/releases/noscript-5.1.7.xpi
 mv ./noscript-5.1.7.xpi ./FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
+echo "Done."