diff --git a/nvm.sh b/nvm.sh
old mode 100644
new mode 100755
index 4b500c5..daaaae3
--- a/nvm.sh
+++ b/nvm.sh
@@ -859,7 +859,6 @@ nvm_get_arch() {
   case "$NVM_UNAME" in
     *x86_64*) NVM_ARCH=x64 ;;
     *i*86*) NVM_ARCH=x86 ;;
-    *armv6l*) NVM_ARCH=arm-pi ;;
     *) NVM_ARCH="$(uname -m)" ;;
   esac
   echo "$NVM_ARCH"
@@ -937,7 +936,12 @@ nvm_install_node_binary() {
 
   if [ -n "$NVM_OS" ]; then
     if nvm_binary_available "$VERSION"; then
-      t="$VERSION-$NVM_OS-$(nvm_get_arch)"
+      local NVM_ARCH
+      NVM_ARCH="$(nvm_get_arch)"
+      if [ $NVM_ARCH = "armv6l" ]; then
+         NVM_ARCH="arm-pi"
+      fi
+      t="$VERSION-$NVM_OS-$NVM_ARCH"
       url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz"
       sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | command grep node-${t}.tar.gz | command awk '{print $1}'`
       local tmpdir