diff --git a/README.md b/README.md
index 9a668d7..45c79cd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# VPN Client
+# VPN Client [![Build Status](https://travis-ci.org/labriqueinternet/vpnclient_ynh.svg?branch=master)](https://travis-ci.org/labriqueinternet/vpnclient_ynh) [![Integration level](https://dash.yunohost.org/integration/vpnclient.svg)](https://ci-apps.yunohost.org/jenkins/job/vpnclient%20%28Community%29/lastBuild/consoleFull)  
+[![Install LaBriqueInterNet VPNclient with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=vpnclient)
+
 ## Overview
 
 VPN Client app for [YunoHost](http://yunohost.org/).
diff --git a/conf/ynh-vpnclient b/conf/ynh-vpnclient
index 910e282..a75823c 100644
--- a/conf/ynh-vpnclient
+++ b/conf/ynh-vpnclient
@@ -129,6 +129,10 @@ start_openvpn() {
     [ "${ynh_server_proto}" == tcp ] && proto=tcp-client
   fi
 
+  # Unset firewall to let DNS and NTP resolution works
+  # Firewall is reset after vpn is mounted (more details on #1016)
+  unset_firewall
+
   sync_time
 
   cp /etc/openvpn/client.conf{.tpl,}
@@ -199,7 +203,21 @@ stop_openvpn() {
 
 sync_time() {
   systemctl stop ntp
-  ntpd -qg &> /dev/null
+  timeout 20 ntpd -qg &> /dev/null
+  
+  # Some networks drop ntp port (udp 123). 
+  # Try to get the date with an http request on the internetcube web site
+  if [ $? -ne 0 ]; then
+    http_date=`curl -sD - labriqueinter.net | grep '^Date:' | cut -d' ' -f3-6`
+    http_date_seconds=`date -d "${http_date}" +%s`
+    curr_date_seconds=`date +%s`
+
+    # Set the new date if it's greater than the current date
+    # So it does if 1970 year or if old fake-hwclock date is used
+    if [ $http_date_seconds -ge $curr_date_seconds ]; then
+      date -s "${http_date}"
+    fi
+  fi 
   systemctl start ntp
 }
 
diff --git a/manifest.json b/manifest.json
index 902fa42..462555d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,9 @@
     "fr": "Client VPN"
   },
   "license": "AGPL-3",
-  "developer": {
+  "url": "https://github.com/labriqueinternet/vpnclient_ynh",
+  "version": "1.1.1",
+  "maintainer": {
     "name": "Julien Vaubourg",
     "email": "julien@vaubourg.com",
     "url": "http://julien.vaubourg.com"
diff --git a/scripts/install b/scripts/install
index b7747be..1c49433 100644
--- a/scripts/install
+++ b/scripts/install
@@ -33,7 +33,7 @@ fi
 ynh_webpath_register vpnclient $domain $url_path || exit 1
 
 # Install packages
-packages='php5-fpm sipcalc dnsutils openvpn curl'
+packages='php5-fpm sipcalc dnsutils openvpn curl fake-hwclock'
 export DEBIAN_FRONTEND=noninteractive
 
 sudo apt-get --assume-yes --force-yes install ${packages}