diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 5538446..5c4abce 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5063,8 +5063,8 @@
 	     * done, because drawing the cursor would change the display. */
 	    item->analysis.shape_engine = default_shape_engine;
 
-	    pango_shape((const char *)s + item->offset, item->length,
-			&item->analysis, glyphs);
+	    pango_shape_full((const char *)s + item->offset, item->length,
+		    (const char *)s, len, &item->analysis, glyphs);
 	    /*
 	     * Fixed-width hack: iterate over the array and assign a fixed
 	     * width to each glyph, thus overriding the choice made by the
diff --git a/src/version.c b/src/version.c
index 7f7f0dd..7733d4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    855,
+/**/
     854,
 /**/
     853,