diff --git a/testing/release/common/check_updates.sh b/testing/release/common/check_updates.sh
index cf29c91f6a4..9c1bf808c3f 100755
--- a/testing/release/common/check_updates.sh
+++ b/testing/release/common/check_updates.sh
@@ -20,13 +20,13 @@ check_updates () {
   fi
   
   case $update_platform in
-      mac|mac-ppc) 
+      Darwin_ppc-gcc | Darwin_Universal-gcc3) 
           platform_dirname="*.app"
           ;;
-      win32) 
+      WINNT_x86-msvc) 
           platform_dirname="bin"
           ;;
-      linux) 
+      Linux_x86-gcc) 
           platform_dirname=`echo $product | tr '[A-Z]' '[a-z]'`
           ;;
   esac
diff --git a/testing/release/common/download_builds.sh b/testing/release/common/download_builds.sh
index 24ce8e02a7a..1a575f6418a 100644
--- a/testing/release/common/download_builds.sh
+++ b/testing/release/common/download_builds.sh
@@ -3,57 +3,30 @@ download_builds() {
   mkdir -p downloads/
   rm -rf downloads/*
 
-  if [ "Darwin_ppc-gcc3" == $platform ]; then
-    source_platform=mac-ppc
-    dirname="mac-ppc"
-    filename="$product _version_.dmg"
-    shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.dmg"
-  elif [ "Darwin_Universal-gcc3" == $platform ]; then
-    source_platform=mac
-    dirname="mac"
-    filename="$product _version_.dmg"
-    shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.dmg"
-  elif [ "Linux_x86-gcc3" == $platform ]; then
-    source_platform=linux
-    dirname="linux-i686"
-    #dirname="linux"
-    filename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.tar.gz"
-    shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.tar.gz"
-  elif [ "WINNT_x86-msvc" == $platform ]; then
-    source_platform=win32
-    dirname="win32"
-    filename="$product Setup _version_.exe"
-    shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.exe"
+  source_url="$1"
+  target_url="$2"
+
+  if [ -z "$source_url" ] || [ -z "$target_url" ]
+  then
+    "download_builds usage: <source_url> <target_url>"
+    exit 1
   fi
 
-  echo "checking $platform $locale"
-
-  source_file=`echo $filename | sed "s/_version_/$release/"`
-  target_file=`echo $filename | sed "s/_version_/$latest/"`
   cp update/partial.mar update/update.mar
-  if [ -f "$source_file" ]; then rm "$source_file"; fi
-  #PARAMS="--user=user --password=pass"
-  build_url="http://stage.mozilla.org/pub/mozilla.org/`echo $product | tr '[A-Z]' '[a-z]'`/releases/$release/$dirname/$locale/$source_file" 
-  pushd downloads > /dev/null
-  if [ -f "$source_file" ]; then rm "$source_file"; fi
-  wget -nv $PARAMS "$build_url" 2>&1
-  if [ $? != 0 ]; then
-    echo "FAIL: Could not download source $source_file from $build_url" |tee /dev/stderr
-    echo "skipping.."
-    continue
-    popd > /dev/null
-  fi
-  popd > /dev/null
-  if [ -f "$target_file" ]; then rm "$target_file"; fi
-  build_url="http://stage.mozilla.org/pub/mozilla.org/`echo $product | tr '[A-Z]' '[a-z]'`/releases/$latest/$dirname/$locale/$target_file" 
-  pushd downloads > /dev/null
-  if [ -f "$target_file" ]; then rm "$target_file"; fi
-  wget -nv $PARAMS "$build_url" 2>&1
-  if [ $? != 0 ]; then
-    echo "FAIL: Could not download target $target_file from $build_url" |tee /dev/stderr
-    echo "skipping.."
-    continue
-    popd > /dev/null
-  fi
-  popd > /dev/null
+  for url in "$source_url" "$target_url"
+    do
+    source_file=`basename "$url"`
+    if [ -f "$source_file" ]; then rm "$source_file"; fi
+    #PARAMS="--user=user --password=pass"
+    cd downloads 
+    if [ -f "$source_file" ]; then rm "$source_file"; fi
+    wget -nv $PARAMS "$url" 2>&1
+    if [ $? != 0 ]; then
+      echo "FAIL: Could not download source $source_file from $url" |tee /dev/stderr
+      echo "skipping.."
+      cd ../
+      continue
+    fi
+    cd ../
+  done
 }
diff --git a/testing/release/common/unpack.sh b/testing/release/common/unpack.sh
index af9267601fb..9b8dc492ccc 100755
--- a/testing/release/common/unpack.sh
+++ b/testing/release/common/unpack.sh
@@ -28,7 +28,7 @@ unpack_build () {
               done
             fi
             ;;
-        linux) 
+        linux-i686|linux) 
             tar xfz ../"$pkg_file" > /dev/null
             ;;
     esac