diff --git a/scripts/restore b/scripts/restore
index f26d606..f8b2b3e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -51,6 +51,32 @@ fi
 
 #=================================================
 # STANDARD RESTORATION STEPS
+#=================================================
+# OPEN PORTS
+#=================================================
+
+if [ $discovery -eq 1 ]; then
+	ynh_script_progression --message="Configuring firewall..." --time --weight=1
+
+	# Open port 1900 for service auto-discovery
+	if ynh_port_available --port=1900; then
+		ynh_exec_warn_less yunohost firewall allow UDP 1900
+		ynh_app_setting_set --app=$app --key=discovery_service --value=1
+	else
+		ynh_print_warn --message="Port 1900 (for service auto-discovery) is not available. Continuing nonetheless."
+		ynh_app_setting_set --app=$app --key=discovery_service --value=0
+	fi
+
+	# Open port 7359 for client auto-discovery
+	if ynh_port_available --port=7359; then
+		ynh_exec_warn_less yunohost firewall allow UDP 7359
+		ynh_app_setting_set --app=$app --key=discovery_client --value=1
+	else
+		ynh_print_warn --message="Port 7359 (for client auto-discovery) is not available. Continuing nonetheless."
+		ynh_app_setting_set --app=$app --key=discovery_client --value=0
+	fi
+fi
+
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 57289e1..b324d30 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -87,6 +87,32 @@ ynh_abort_if_errors
 
 #=================================================
 # STANDARD UPGRADE STEPS
+#=================================================
+# OPEN PORTS
+#=================================================
+
+if [ $discovery -eq 1 ]; then
+	ynh_script_progression --message="Configuring firewall..." --time --weight=1
+
+	# Open port 1900 for service auto-discovery
+	if ynh_port_available --port=1900; then
+		ynh_exec_warn_less yunohost firewall allow UDP 1900
+		ynh_app_setting_set --app=$app --key=discovery_service --value=1
+	else
+		ynh_print_warn --message="Port 1900 (for service auto-discovery) is not available. Continuing nonetheless."
+		ynh_app_setting_set --app=$app --key=discovery_service --value=0
+	fi
+
+	# Open port 7359 for client auto-discovery
+	if ynh_port_available --port=7359; then
+		ynh_exec_warn_less yunohost firewall allow UDP 7359
+		ynh_app_setting_set --app=$app --key=discovery_client --value=1
+	else
+		ynh_print_warn --message="Port 7359 (for client auto-discovery) is not available. Continuing nonetheless."
+		ynh_app_setting_set --app=$app --key=discovery_client --value=0
+	fi
+fi
+
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================