diff --git a/share/doc/states/states-complete.dot b/share/doc/states/states-complete.dot
index ed5dafa4a5..62835d80e2 100644
--- a/share/doc/states/states-complete.dot
+++ b/share/doc/states/states-complete.dot
@@ -19,14 +19,13 @@ digraph OpenNebula {
     "ANY \\ {suspended,poweroff,done}" [ shape="box" ];
 
     subgraph { rank = min; user}
-    subgraph { rank = same; boot; boot_stopped boot_suspended; boot_unknown; boot_poweroff; unknown; color="white"}
+    subgraph { rank = same; boot; boot_stopped; boot_undeploy; boot_suspended; boot_unknown; boot_poweroff; unknown; color="white"}
     subgraph { rank = same; pending; hold; color="white"}
     subgraph { rank = same; prolog; prolog_resume; prolog_migrate; color="white" }
 //    subgraph { rank = same; prolog; prolog_resume; prolog_migrate; save_migrate; color="white" }
 
     subgraph { rank = max; suspended; done; failure;
-    stopped; poweroff; ANY; color="white" }
-//    stopped; poweroff; color="white" }
+    stopped; undeployed; poweroff; ANY; color="white" }
 
 #   create
     user -> pending [label="create"];
@@ -35,6 +34,9 @@ digraph OpenNebula {
     pending     -> prolog_resume [label="deploy\n(from stopped)"];
     prolog_resume -> boot_stopped [style="dashed"];
 
+    pending         -> prolog_undeploy [label="deploy\n(from undeployed)"];
+    prolog_undeploy -> boot_undeploy [style="dashed"];
+
     pending     -> prolog [label="deploy"];
     prolog      -> boot [style="dashed"];
     boot        -> running [style="dashed"];
@@ -52,7 +54,7 @@ digraph OpenNebula {
     cancel      -> running [style="dotted"];
 
 #   poweroff
-    running             -> shutdown_poweroff [label="poweroff"];
+    running             -> shutdown_poweroff [label="poweroff [--hard]"];
     shutdown_poweroff   -> poweroff [style="dashed"];
 
     shutdown_poweroff   -> running [style="dotted"];
@@ -79,6 +81,12 @@ digraph OpenNebula {
     save_stop   -> running [style="dotted"];
     epilog_stop -> stopped [style="dashed"];
 
+#   undeploy
+    running             -> shutdown_undeploy [label="undeploy [--hard]"];
+    shutdown_undeploy   -> epilog_undeploy [style="dashed"];
+    shutdown_undeploy   -> running [style="dotted"];
+    epilog_undeploy     -> undeployed [style="dashed"];
+
 #   suspend
     running         -> save_suspend [label="suspend"];
     save_suspend    -> suspended [style="dashed"];
@@ -88,6 +96,9 @@ digraph OpenNebula {
     stopped         -> pending [label="resume"];
     boot_stopped    -> running [style="dashed"];
 
+    undeployed      -> pending [label="resume"];
+    boot_undeploy   -> running [style="dashed"];
+
     suspended       -> boot_suspended [label="resume"];
     boot_suspended  -> running [style="dashed"];
 
@@ -105,6 +116,7 @@ digraph OpenNebula {
     boot_suspended  -> boot_suspended [label="boot"];
     boot_stopped    -> boot_stopped [label="boot"];
     boot_poweroff   -> boot_poweroff [label="boot"];
+    boot_undeploy   -> boot_undeploy [label="boot"];
 
     unknown         -> boot_unknown [label="boot"];
     boot_unknown    -> boot_unknown [label="boot"];
@@ -138,16 +150,19 @@ digraph OpenNebula {
 #   failures and misc.
     epilog_stop     -> failure [style="dotted"];
     epilog          -> failure [style="dotted"];
+    epilog_undeploy -> failure [style="dotted"];
 
     prolog          -> failure [style="dotted"];
     prolog_migrate  -> failure [style="dotted"];
     prolog_resume   -> stopped [style="dotted"];
+    prolog_undeploy -> undeployed [style="dotted"];
 
     boot            -> failure [style="dotted"];
     boot_poweroff   -> poweroff [style="dotted"];
     boot_unknown    -> unknown [style="dotted"];
     boot_suspended  -> suspended [style="dotted"];
     boot_stopped    -> epilog_stop [style="dotted"];
+    boot_undeploy   -> epilog_undeploy [style="dotted"];
 
     running -> failure [style="dotted"];
     unknown -> failure [style="dotted"];
diff --git a/share/doc/states/states-simple.dot b/share/doc/states/states-simple.dot
index 65a567e25e..25ba06bf1a 100644
--- a/share/doc/states/states-simple.dot
+++ b/share/doc/states/states-simple.dot
@@ -19,11 +19,11 @@ digraph OpenNebula {
     "ANY \\ {suspended,poweroff,done}" [ shape="box" ];
 
     subgraph { rank = min; user}
-#    subgraph { rank = same; pending; hold; color="white"}
-    subgraph { rank = same; prolog; boot; color="white" }
+    subgraph { rank = same; pending; hold; color="white"}
+#    subgraph { rank = same; prolog; boot; color="white" }
     subgraph { rank = same; migrate; save; shutdown; unknown; hotplug; snapshot;
         color="white" }
-    subgraph { rank = max; suspended; done; failure; stopped; poweroff; color="white" }
+    subgraph { rank = max; suspended; done; failure; stopped; poweroff; undeployed; color="white" }
 
 #   create
     user -> pending [label="create"];
@@ -36,7 +36,7 @@ digraph OpenNebula {
 #   shutdown
     running     -> shutdown [label="shutdown"];
     shutdown    -> epilog [label="shutdown", style="dashed"];
-    epilog      -> done [style="dashed"];
+    epilog      -> done [label="shutdown", style="dashed"];
 
 #   poweroff
     running     -> shutdown [label="poweroff"];
@@ -62,12 +62,18 @@ digraph OpenNebula {
     save        -> epilog [label="stop", style="dashed"];
     epilog      -> stopped [label="stop", style="dashed"];
 
+#   undeploy
+    running     -> shutdown [label="undeploy"];
+    shutdown    -> epilog [label="undeploy", style="dashed"];
+    epilog      -> undeployed [label="undeploy", style="dashed"];
+
 #   suspend
     running     -> save [label="suspend"];
     save        -> suspended [label="suspend", style="dashed"];
 
 #   resume
     stopped     -> pending [label="resume"];
+    undeployed  -> pending [label="resume"];
     suspended   -> boot [label="resume"];
     poweroff    -> boot [label="resume"];
 
diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd
index f7c7d29381..31b90573e2 100644
--- a/share/doc/xsd/acct.xsd
+++ b/share/doc/xsd/acct.xsd
@@ -77,6 +77,7 @@
                 DONE      = 6
                 FAILED    = 7
                 POWEROFF  = 8
+                UNDEPLOYED = 9
               -->
               <xs:element name="STATE" type="xs:integer"/>
 
@@ -111,7 +112,11 @@
                 HOTPLUG_NIC         = 25,
                 HOTPLUG_SAVEAS           = 26,
                 HOTPLUG_SAVEAS_POWEROFF  = 27,
-                HOTPLUG_SAVEAS_SUSPENDED = 28
+                HOTPLUG_SAVEAS_SUSPENDED = 28,
+                SHUTDOWN_UNDEPLOY   = 29,
+                EPILOG_UNDEPLOY     = 30,
+                PROLOG_UNDEPLOY     = 31,
+                BOOT_UNDEPLOY       = 32
               -->
               <xs:element name="LCM_STATE" type="xs:integer"/>
               <xs:element name="RESCHED" type="xs:integer"/>
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index fa5babf322..a6e6d2dcdd 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -39,6 +39,7 @@
           DONE      = 6
           FAILED    = 7
           POWEROFF  = 8
+          UNDEPLOYED = 9
         -->
         <xs:element name="STATE" type="xs:integer"/>
 
@@ -73,7 +74,11 @@
           HOTPLUG_NIC         = 25,
           HOTPLUG_SAVEAS           = 26,
           HOTPLUG_SAVEAS_POWEROFF  = 27,
-          HOTPLUG_SAVEAS_SUSPENDED = 28
+          HOTPLUG_SAVEAS_SUSPENDED = 28,
+          SHUTDOWN_UNDEPLOY   = 29,
+          EPILOG_UNDEPLOY     = 30,
+          PROLOG_UNDEPLOY     = 31,
+          BOOT_UNDEPLOY       = 32
         -->
         <xs:element name="LCM_STATE" type="xs:integer"/>
         <xs:element name="RESCHED" type="xs:integer"/>