diff --git a/tigervnc.changes b/tigervnc.changes
index 41537d6..3caac5a 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 11 08:12:52 UTC 2018 - msrb@suse.com
+
+- u_change-button-layout-in-ServerDialog.patch
+  * To fit strings in languages with longer words... (bnc#1084865)
+
 -------------------------------------------------------------------
 Thu Mar 22 14:27:28 UTC 2018 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 30b66c6..c3dab5a 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -140,6 +140,7 @@ Patch10:        U_handle_certificate_verification_for_saved_certs_correctly.patc
 Patch11:        u_tigervnc-add-autoaccept-parameter.patch
 Patch12:        u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch
 Patch13:        tigervnc-1.8.0-nowindows.patch
+Patch14:        u_change-button-layout-in-ServerDialog.patch
 
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
@@ -241,6 +242,7 @@ cp -r /usr/src/xserver/* unix/xserver/
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 pushd unix/xserver
 patch -p1 < ../xserver119.patch
diff --git a/u_change-button-layout-in-ServerDialog.patch b/u_change-button-layout-in-ServerDialog.patch
new file mode 100644
index 0000000..4a4bea1
--- /dev/null
+++ b/u_change-button-layout-in-ServerDialog.patch
@@ -0,0 +1,35 @@
+Patch-mainline: To be upstreamed
+References: bnc#1084865
+Author: Michal Srb <msrb@suse.com>
+Subject: Change button layout in ServerDialog.
+
+To fit strings in languages with longer words...
+---
+ vncviewer/ServerDialog.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/vncviewer/ServerDialog.cxx b/vncviewer/ServerDialog.cxx
+index de67f87b..0a8aa775 100644
+--- a/vncviewer/ServerDialog.cxx
++++ b/vncviewer/ServerDialog.cxx
+@@ -53,7 +53,7 @@ ServerDialog::ServerDialog()
+   
+   serverName = new Fl_Input(x, y, w() - margin*2 - server_label_width, INPUT_HEIGHT, _("VNC server:"));
+ 
+-  int adjust = (w() - 20) / 4;
++  int adjust = (w() - 20) / 3;
+   int button_width = adjust - margin/2;
+ 
+   x = margin;
+@@ -76,6 +76,8 @@ ServerDialog::ServerDialog()
+   
+   x = 0;
+   y += margin/2 + BUTTON_HEIGHT;
++  adjust = (w() - 20) / 4;
++  button_width = adjust - margin/2;
+ 
+   divider = new Fl_Box(x, y, w(), 2);
+   divider->box(FL_THIN_DOWN_FRAME);
+-- 
+2.13.6
+