diff --git a/scripts/_common.sh b/scripts/_common.sh
index 66537ee..7235345 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,14 +13,14 @@ x86_64)  ARCHITECTURE="amd64"
     ;;
 i386|i686)  ARCHITECTURE="386"
     ;;
-armhf|armel)  ARCHITECTURE="arm"
+armhf|armel|armv7l)  ARCHITECTURE="arm"
     ;;
 *) echo "Unable to detect your achitecture" && exit 1
    ;;
 esac
 
 # Remote URL to fetch Gogs tarball
-GOGS_BINARY_URL="https://github.com/gogits/gogs/releases/download/v${VERSION}/linux_${ARCHITECTURE}.tar.gz"
+GOGS_BINARY_URL="https://github.com/gogits/gogs/releases/download/v${VERSION}/linux_${ARCHITECTURE}.zip"
 
 #
 # Common helpers
@@ -32,11 +32,11 @@ extract_gogs() {
   local DESTDIR=$1
 
   # retrieve and extract Gogs tarball
-  gogs_tarball="/tmp/gogs.tar.gz"
+  gogs_tarball="/tmp/gogs.zip"
   rm -f "$gogs_tarball"
   wget -q -O "$gogs_tarball" "$GOGS_BINARY_URL" \
     || ynh_die "Unable to download Gogs tarball"
-  sudo tar xf "$gogs_tarball" -C "$DESTDIR" --strip-components 1 \
+  sudo unzip "$gogs_tarball" -d "$DESTDIR" \
     || ynh_die "Unable to extract Gogs tarball"
   rm -f "$gogs_tarball"
 }