diff --git a/bin/fetch-configlet b/bin/fetch-configlet
index df2c0d908..4800e1508 100755
--- a/bin/fetch-configlet
+++ b/bin/fetch-configlet
@@ -24,12 +24,12 @@ get_download_url() {
   local latest='https://api.github.com/repos/exercism/configlet/releases/latest'
   local arch
   case "$(uname -m)" in
-    *64*)  arch='64bit' ;;
-    *686*) arch='32bit' ;;
-    *386*) arch='32bit' ;;
-    *)     arch='64bit' ;;
+    x86_64) arch='x86-64' ;;
+    *686*)  arch='i386'   ;;
+    *386*)  arch='i386'   ;;
+    *)      arch='x86-64' ;;
   esac
-  local suffix="${os}-${arch}.${ext}"
+  local suffix="${os}_${arch}.${ext}"
   curl "${curlopts[@]}" --header 'Accept: application/vnd.github.v3+json' "${latest}" |
     grep "\"browser_download_url\": \".*/download/.*/configlet.*${suffix}\"$" |
     cut -d'"' -f4
@@ -48,7 +48,7 @@ main() {
 
   local os
   case "$(uname)" in
-    Darwin*)   os='mac'     ;;
+    Darwin*)   os='macos'   ;;
     Linux*)    os='linux'   ;;
     Windows*)  os='windows' ;;
     MINGW*)    os='windows' ;;
@@ -58,8 +58,8 @@ main() {
 
   local ext
   case "${os}" in
-    windows*) ext='zip' ;;
-    *)        ext='tgz' ;;
+    windows*) ext='zip'    ;;
+    *)        ext='tar.gz' ;;
   esac
 
   echo "Fetching configlet..." >&2