diff --git a/content.c b/content.c
index abd04da34a..6672d60ec0 100644
--- a/content.c
+++ b/content.c
@@ -45,6 +45,7 @@
 #include "movie.h"
 #include "patch.h"
 #include "system.h"
+#include "libretro_version_1.h"
 #include "verbosity.h"
 
 #ifdef HAVE_CHEEVOS
@@ -159,30 +160,32 @@ static bool dump_to_file_desperate(const void *data,
  **/
 static bool content_save_state(const char *path)
 {
+   retro_ctx_size_info_t info;
    bool ret    = false;
    void *data  = NULL;
-   size_t size = core.retro_serialize_size();
+
+   core_ctl(CORE_CTL_RETRO_SERIALIZE_SIZE, &info);
 
    RARCH_LOG("%s: \"%s\".\n",
          msg_hash_to_str(MSG_SAVING_STATE),
          path);
 
-   if (size == 0)
+   if (info.size == 0)
       return false;
 
-   data = malloc(size);
+   data = malloc(info.size);
 
    if (!data)
       return false;
 
    RARCH_LOG("%s: %d %s.\n",
          msg_hash_to_str(MSG_STATE_SIZE),
-         (int)size,
+         (int)info.size,
          msg_hash_to_str(MSG_BYTES));
-   ret = core.retro_serialize(data, size);
+   ret = core.retro_serialize(data, info.size);
 
    if (ret)
-      ret = retro_write_file(path, data, size);
+      ret = retro_write_file(path, data, info.size);
    else
    {
       RARCH_ERR("%s \"%s\".\n",
diff --git a/libretro_version_1.c b/libretro_version_1.c
index 7284d2b5bf..e1472fab50 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -172,6 +172,14 @@ bool core_ctl(enum core_ctl_state state, void *data)
 
    switch (state)
    {
+      case CORE_CTL_RETRO_SERIALIZE_SIZE:
+         {
+            retro_ctx_size_info_t *info = (retro_ctx_size_info_t *)data;
+            if (!info)
+               return false;
+            info->size = core.retro_serialize_size();
+         }
+         break;
       case CORE_CTL_RETRO_CTX_FRAME_CB:
          {
             retro_ctx_frame_info_t *info = (retro_ctx_frame_info_t*)data;
diff --git a/libretro_version_1.h b/libretro_version_1.h
index ee7b636a18..5bb31deb7d 100644
--- a/libretro_version_1.h
+++ b/libretro_version_1.h
@@ -66,9 +66,16 @@ enum core_ctl_state
 
    CORE_CTL_RETRO_CTX_POLL_CB,
    
-   CORE_CTL_RETRO_SET_ENVIRONMENT
+   CORE_CTL_RETRO_SET_ENVIRONMENT,
+
+   CORE_CTL_RETRO_SERIALIZE_SIZE
 };
 
+typedef struct retro_ctx_size_info
+{
+   size_t size;
+} retro_ctx_size_info_t;
+
 typedef struct retro_ctx_environ_info
 {
    retro_environment_t env;