diff --git a/scripts/upgrade b/scripts/upgrade
index ea44ca5..8cd6ba9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,6 +13,46 @@ final_path=/var/www/z-push
 sudo mkdir -p $final_path
 sudo cp -a ../sources/* $final_path
 
+# Configuration
+sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" ../conf/config*.php
+sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/config*.php
+
+# Enable caldav carddav support
+sudo yunohost app list -f baikal --json | grep '"installed": true'
+if [ "$?" -eq 0 ]; then
+	echo "Detected Baikal"
+	caldavdomain=$(sudo yunohost app setting baikal domain)
+	caldavpath=$(sudo yunohost app setting baikal path)
+	caldavpath=${caldavpath%/}
+
+	# Configuration baikal
+	sed -i "s@BAIKALDOMAIN@$caldavdomain@g" ../conf/backend/config*.php
+	sed -i "s@BAIKALPATH@$caldavpath@g" ../conf/backend/config*.php
+	sed -i "s@DOMAINTOCHANGE@$domain@g" ../conf/backend/config-imap.php
+
+	# Copy config
+	sudo cp ../conf/config-combined.php $final_path/config.php
+	sudo cp ../conf/backend/config-imap.php $final_path/backend/imap/config.php
+	sudo cp ../conf/backend/config-carddav.php $final_path/backend/carddav/config.php
+	sudo cp ../conf/backend/config-caldav.php $final_path/backend/caldav/config.php
+	sudo cp ../conf/backend/config-combined.php $final_path/backend/combined/config.php
+else
+	# Copy config
+	sudo cp ../conf/config.php $final_path/
+	sed -i "s@DOMAINTOCHANGE@$domain@g" ../conf/backend/config-imap.php
+	sudo cp ../conf/backend/config-imap.php $final_path/backend/imap/config.php
+	
+fi
+
+# Create directory
+sudo mkdir -p /var/log/z-push
+sudo chmod 750 /var/log/z-push
+sudo chown www-data:www-data /var/log/z-push
+
+#Copy XMLElement.php
+sudo ln -s /usr/share/awl/inc/XML* /var/www/z-push/include/
+
+
 # Set permissions to roundcube directory
 sudo chown -R www-data: $final_path