diff -Nru gcin-2.8.4+dfsg1/debian/changelog gcin-2.8.4+dfsg1/debian/changelog
--- gcin-2.8.4+dfsg1/debian/changelog	2015-12-02 18:20:09.000000000 +0800
+++ gcin-2.8.4+dfsg1/debian/changelog	2016-08-28 14:31:49.000000000 +0800
@@ -1,3 +1,10 @@
+gcin (2.8.4+dfsg1-1ubuntu1.1) xenial-proposed; urgency=medium
+
+  * fix_get_gcin_xim_name.patch: Fix gnome-terminal-server crash issue.
+    (LP: #1617505) 
+
+ -- Su, Jun-Ming <sujunmin@gmail.com>  Sun, 28 Aug 2016 14:27:46 +0800
+
 gcin (2.8.4+dfsg1-1ubuntu1) xenial; urgency=medium
 
   * Rebuild against Qt 5.5.1.
diff -Nru gcin-2.8.4+dfsg1/debian/patches/fix_get_gcin_xim_name.patch gcin-2.8.4+dfsg1/debian/patches/fix_get_gcin_xim_name.patch
--- gcin-2.8.4+dfsg1/debian/patches/fix_get_gcin_xim_name.patch	1970-01-01 08:00:00.000000000 +0800
+++ gcin-2.8.4+dfsg1/debian/patches/fix_get_gcin_xim_name.patch	2016-08-28 14:26:33.000000000 +0800
@@ -0,0 +1,12 @@
+Index: gcin-2.8.4+dfsg1/gcin-conf.cpp
+===================================================================
+--- gcin-2.8.4+dfsg1.orig/gcin-conf.cpp
++++ gcin-2.8.4+dfsg1/gcin-conf.cpp
+@@ -172,6 +172,7 @@ char *get_gcin_xim_name()
+     static char sstr[32];
+     char *p = strstr(xim_name, find);
+ 
++    if (p == NULL) return "gcin";
+     p += strlen(find);
+     strncpy(sstr, p, sizeof(sstr));
+     sstr[sizeof(sstr) - 1]=0;
diff -Nru gcin-2.8.4+dfsg1/debian/patches/series gcin-2.8.4+dfsg1/debian/patches/series
--- gcin-2.8.4+dfsg1/debian/patches/series	2015-10-15 14:19:48.000000000 +0800
+++ gcin-2.8.4+dfsg1/debian/patches/series	2016-08-28 14:22:57.000000000 +0800
@@ -7,3 +7,4 @@
 DFSG-Remove-dayi3.patch
 Use-qtchooser.patch
 reproducible-build.patch
+fix_get_gcin_xim_name.patch