diff --git a/jedi b/jedi
index b3c89ef..17bec92 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit b3c89effe7dad1b9cc1359b8c345b606da23848c
+Subproject commit 17bec929bbce6dbfed758ab8d9114936be766d87
diff --git a/plugin/jedi_vim.py b/plugin/jedi_vim.py
index e507489..b47ec32 100644
--- a/plugin/jedi_vim.py
+++ b/plugin/jedi_vim.py
@@ -143,11 +143,13 @@ def goto(is_definition=False, is_related_name=False, no_output=False):
             lst = []
             for d in definitions:
                 if d.in_builtin_module():
-                    lst.append(dict(text='Builtin ' + d.description))
+                    lst.append(dict(text=
+                                PythonToVimStr('Builtin ' + d.description)))
                 else:
-                    lst.append(dict(filename=d.module_path, lnum=d.line_nr,
-                                        col=d.column + 1, text=d.description))
-            vim.eval('setqflist(%s)' % str(lst))
+                    lst.append(dict(filename=PythonToVimStr(d.module_path),
+                                    lnum=d.line_nr, col=d.column + 1,
+                                    text=PythonToVimStr(d.description)))
+            vim.eval('setqflist(%s)' % repr(lst))
             vim.eval('<sid>add_goto_window()')
     return definitions