diff --git a/setup b/setup
index 66837ffeeb..2cd63c072c 100755
--- a/setup
+++ b/setup
@@ -56,11 +56,12 @@ CLANG_PATH=""
 
 OPENOCD_URL="https://github.com/gnu-mcu-eclipse/openocd/releases/download"
 OPENOCD_VERSION="0.10.0-10-20181020"
+OPENOCD_VERSION_BASE="0522"
 OPENOCD_BASE="$OPENOCD_URL/v$OPENOCD_VERSION/gnu-mcu-eclipse-openocd-$OPENOCD_VERSION"
-OPENOCD_MAC_URL="$OPENOCD_BASE-1448-osx.tgz"
-OPENOCD_MAC_PATH="gnu-mcu-eclipse-openocd-$OPENOCD_VERSION-1448-osx.tgz"
-OPENOCD_LINUX64_URL="$OPENOCD_BASE-0522-centos64.tgz"
-OPENOCD_LINUX64_PATH="gnu-mcu-eclipse-openocd-$OPENOCD_VERSION-0522-centos64.tgz"
+OPENOCD_MAC_URL="$OPENOCD_BASE-$OPENOCD_VERSION_BASE-macos.tgz"
+OPENOCD_MAC_PATH="gnu-mcu-eclipse-openocd-$OPENOCD_VERSION-$OPENOCD_VERSION_BASE-macos.tgz"
+OPENOCD_LINUX64_URL="$OPENOCD_BASE-$OPENOCD_VERSION_BASE-centos64.tgz"
+OPENOCD_LINUX64_PATH="gnu-mcu-eclipse-openocd-$OPENOCD_VERSION-$OPENOCD_VERSION_BASE-centos64.tgz"
 OPENOCD_PKG=""
 
 echo " ──────────────────────────────────────────────────┐"