diff --git a/docs/general-troubleshooting.md b/docs/general-troubleshooting.md
index 417cd995c..cb47a0c0f 100644
--- a/docs/general-troubleshooting.md
+++ b/docs/general-troubleshooting.md
@@ -13,13 +13,15 @@ $ xoa check
 ✔ Appliance registration
 ✔ Internet connectivity
 ```  
-If the result you have is completely different from that, or if error messages are displayed, lost packets, etc., you have, indeed, a problem. The next step should be to check in this document if there is an existing troubleshooting for the problem you have. 
+If the result you have is completely different from that, or if error messages are displayed, lost packets, etc., you have, indeed, a problem. The next step should be to check in this document if there is an existing troubleshooting for the problem you have.
 
 > You can also access the log by using this command: `$ tail -f /var/log/syslog` ([learn more](https://xen-orchestra.com/docs/logs.html))
 
 ## General
 
 * [Empty page after login](https://xen-orchestra.com/docs/troubleshooting.html#empty-page-after-login)
+* [Can't migrate XOA](https://xen-orchestra.com/docs/troubleshooting.html#xoa-migration-issues)
+* [Can't boot XOA](https://xen-orchestra.com/docs/troubleshooting.html#xoa-boot-issues)
 * [Network issues](https://xen-orchestra.com/docs/troubleshooting.html#network-issues)
 * [Out of memory](https://xen-orchestra.com/docs/troubleshooting.html#memory)
 * [Transparent proxy and updater](https://xen-orchestra.com/docs/troubleshooting.html#behind-a-transparent-proxy)
@@ -32,5 +34,5 @@ If the result you have is completely different from that, or if error messages a
 * [SR_backend_failure_44](https://xen-orchestra.com/docs/backup_troubleshooting.html#srbackendfailure44-insufficient-space)
 * [Could not find the base VM](https://xen-orchestra.com/docs/backup_troubleshooting.html#could-not-find-the-base-vm)
 
-## You haven't found a solution here? 
-Open a ticket concerning your issue on your personal space [here](https://xen-orchestra.com/#!/member/support) 
+## You haven't found a solution here?
+Open a ticket concerning your issue on your personal space [here](https://xen-orchestra.com/#!/member/support)
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index ef86c0dc6..67878307b 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -18,6 +18,27 @@ This is happening when your anti-virus or firewall is blocking websocket protoco
 
 The solution is to use **HTTPS**. In this way, websockets will be encapsulated in the secured protocol, avoiding interception from your firewalls or anti-virus system.
 
+## XOA migration issues
+
+By default, XOA got a static max memory set to 16GiB. Sometimes, you can have trouble to migrate with this error message:
+
+```
+"Failed","Migrating VM 'XOA' from '<origin_hostname>' to '<destination_hostname>'
+Internal error: Xenops_interface.Internal_error("Domain.Xenguest_failure(\"Error while waiting for suspend notification: xenguest: xc_domain_save: [1] Save failed (0 = Success)\")")
+
+```
+
+In this case, it means you need to reduce the static max memory field to a lower value, and try again.
+
+## XOA boot issues
+
+XOA is configured in HVM. It means you need a hardware that support HVM instructions (almost all hardware since 2011). If it's not the case, the symptom is this one:
+
+1. XOA VM starts for few seconds
+2. Then shutdown itself
+
+Please check that you have enabled virtualization settings in your BIOS or upgrade your hardware.
+
 ## XOA configuration
 
 XOA is a virtual appliance running Debian and Xen Orchestra. If you have any problem, the first thing to do is to use our check service by running the `xoa check` command in a terminal: