diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 9a289b4..4e51579 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -34,6 +34,42 @@ typedef struct {
     uint32_t fiq_enabled;
 } integratorcm_state;

+static void integratorcm_do_remap(integratorcm_state *s, int flash);
+
+static int integratorcm_post_load(void *opaque, int version_id)
+{
+    integratorcm_state *s = opaque;
+
+    if (s->cm_ctrl & 4) {
+        integratorcm_do_remap(s, 0);
+    }
+    /* ??? tlb_flush (cpu_single_env, 1); */
+    return 0;
+}
+
+static const VMStateDescription vmstate_integratorcm = {
+    .name = "integratorcm",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .post_load = integratorcm_post_load,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT32(memsz, integratorcm_state),
+        VMSTATE_UINT32(cm_osc, integratorcm_state),
+        VMSTATE_UINT32(cm_ctrl, integratorcm_state),
+        VMSTATE_UINT32(cm_lock, integratorcm_state),
+        VMSTATE_UINT32(cm_auxosc, integratorcm_state),
+        VMSTATE_UINT32(cm_sdram, integratorcm_state),
+        VMSTATE_UINT32(cm_init, integratorcm_state),
+        VMSTATE_UINT32(cm_flags, integratorcm_state),
+        VMSTATE_UINT32(cm_nvflags, integratorcm_state),
+        VMSTATE_UINT32(int_level, integratorcm_state),
+        VMSTATE_UINT32(irq_enabled, integratorcm_state),
+        VMSTATE_UINT32(fiq_enabled, integratorcm_state),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static uint8_t integrator_spd[128] = {
    128, 8, 4, 11, 9, 1, 64, 0,  2, 0xa0, 0xa0, 0, 0, 8, 0, 1,
    0xe, 4, 0x1c, 1, 2, 0x20, 0xc0, 0, 0, 0, 0, 0x30, 0x28, 0x30, 0x28, 0x40
@@ -547,6 +583,7 @@ static SysBusDeviceInfo core_info = {
     .init = integratorcm_init,
     .qdev.name  = "integrator_core",
     .qdev.size  = sizeof(integratorcm_state),
+    .qdev.vmsd = &vmstate_integratorcm,
     .qdev.props = (Property[]) {
         DEFINE_PROP_UINT32("memsz", integratorcm_state, memsz, 0),
         DEFINE_PROP_END_OF_LIST(),