diff --git a/.travis.yml b/.travis.yml
index be696f4..dd2969d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,9 @@ notifications:
     on_success: change
     on_failure: always
 addons:
-  ssh_known_hosts: download.kiwix.org
+  ssh_known_hosts:
+  - download.kiwix.org
+  - download.openzim.org
   apt:
     sources:
       - ubuntu-toolchain-r-test
diff --git a/travis/compile_all.py b/travis/compile_all.py
index f2e9266..a048a1d 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -96,7 +96,12 @@ if environ['TRAVIS_EVENT_TYPE'] != 'cron' and not make_release:
     sys.exit(0)
 
 if PLATFORM.startswith('android'):
-    TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android')
+    if make_release:
+        # (For now ?) kiwix-android follow it own release process.
+        # Do not try to make a release of it
+        TARGETS = ('libzim', 'kiwix-lib')
+    else:
+        TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android')
 elif PLATFORM.startswith('native_'):
     TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib', 'kiwix-tools')
 else:
diff --git a/travis/deploy.sh b/travis/deploy.sh
index 3b23dc3..bc01a6a 100755
--- a/travis/deploy.sh
+++ b/travis/deploy.sh
@@ -17,16 +17,14 @@ then
       ${NIGHTLY_ARCHIVES} \
       nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/$(date +%Y-%m-%d)
   fi
-fi
-
-if [[ "x$TRAVIS_TAG" != "x" ]]
+elif [[ "x$TRAVIS_TAG" != "x" ]]
 then
   RELEASE_ARCHIVES=$(find $RELEASE_ARCHIVES_DIR -type f)
   if [[ "x$RELEASE_ARCHIVES" != "x" ]]
   then
     scp -vrp -i ${SSH_KEY} \
       ${RELEASE_ARCHIVES} \
-      nightlybot@downoald.kiwix.org:/var/www/download.kiwix.org/releases
+      nightlybot@download.kiwix.org:/var/www/download.kiwix.org/releases
   fi
 
   DIST_KIWIX_ARCHIVES=$(find $DIST_KIWIX_ARCHIVES_DIR -type f)