diff --git a/agkyra/mktarball.sh b/agkyra/mktarball.sh
index ede428232455d52aafb8f802874dbcaa2615669d..02ecd607462f2e0ff706a19f7b03052b73246c7f 100755
--- a/agkyra/mktarball.sh
+++ b/agkyra/mktarball.sh
@@ -60,4 +60,9 @@ fi
 rm $file
 
 cd $TMPDIR
-tar czf $CURPWD/agkyra-snapshot-${os}.tar.gz agkyra
+ARCHIVENAME=$CURPWD/agkyra-snapshot-${os}
+if [[ "$os" =~ ^(linux64|linux32)$ ]]; then
+    tar czf ${ARCHIVENAME}.tar.gz agkyra
+else
+    zip -r ${ARCHIVENAME}.zip agkyra
+fi