diff --git a/runtime/autoload/msgpack.vim b/runtime/autoload/msgpack.vim
index 7dd225e3d9..7f98a5b230 100644
--- a/runtime/autoload/msgpack.vim
+++ b/runtime/autoload/msgpack.vim
@@ -56,6 +56,7 @@ function s:msgpack_init_python() abort
               \. "  time = datetime.datetime.fromtimestamp(timestamp)\n"
               \. "  return time.strftime(fmt)\n"
               \. "def shada_dict_strptime():\n"
+              \. "  import calendar\n"
               \. "  import datetime\n"
               \. "  import vim\n"
               \. "  fmt = vim.eval('a:format')\n"
@@ -64,7 +65,10 @@ function s:msgpack_init_python() abort
               \. "  try:\n"
               \. "    timestamp = int(timestamp.timestamp())\n"
               \. "  except:\n"
-              \. "    timestamp = int(timestamp.strftime('%s'))\n"
+              \. "    try:\n"
+              \. "      timestamp = int(timestamp.strftime('%s'))\n"
+              \. "    except:\n"
+              \. "      timestamp = calendar.timegm(timestamp.utctimetuple())\n"
               \. "  if timestamp > 2 ** 31:\n"
               \. "    tsabs = abs(timestamp)\n"
               \. "    return ('{\"_TYPE\": v:msgpack_types.integer,'\n"