diff --git a/tigervnc.changes b/tigervnc.changes
index 01bbbda..ecc45ba 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 16 14:25:35 UTC 2015 - msrb@suse.com
+
+- u_tigervnc_update_default_vncxstartup.patch
+  * Update default VNC xstartup script.
+- Add dependency on xinit and icewm. (bnc#956537)
+
 -------------------------------------------------------------------
 Thu Nov 12 12:51:31 UTC 2015 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index a328c75..56e190a 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -121,6 +121,7 @@ Patch11:        N_tigervnc_revert_fltk_1_3_3_requirements.patch
 Patch12:        U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
 Patch13:        u_tigervnc-vncserver-clean-pid-files.patch
 Patch14:        u_xserver118.patch
+Patch15:        u_tigervnc_update_default_vncxstartup.patch
 
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
@@ -135,10 +136,12 @@ Requires(post): openssl
 Requires(post): /usr/sbin/useradd
 Requires(post): /usr/sbin/groupadd
 # Needed to serve java applet
+Requires:       icewm
 Requires:       python
 Requires:       python-pyOpenSSL
 Requires:       xauth
 Requires:       xinetd
+Requires:       xinit
 Requires:       xkbcomp
 Requires:       xkeyboard-config
 Summary:        TigerVNC implementation of Xvnc
@@ -165,6 +168,7 @@ cp -r /usr/src/xserver/* unix/xserver/
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 pushd unix/xserver
 patch -p1 < ../xserver117.patch
diff --git a/u_tigervnc_update_default_vncxstartup.patch b/u_tigervnc_update_default_vncxstartup.patch
new file mode 100644
index 0000000..1ecb70a
--- /dev/null
+++ b/u_tigervnc_update_default_vncxstartup.patch
@@ -0,0 +1,55 @@
+Author: Michal Srb <msrb@suse.com>
+References: bnc#956537
+Subject: Update default vnc xstartup script.
+
+Index: tigervnc-1.5.0/unix/vncserver
+===================================================================
+--- tigervnc-1.5.0.orig/unix/vncserver
++++ tigervnc-1.5.0/unix/vncserver
+@@ -59,27 +59,31 @@ $defaultXStartup
+     = ("#!/bin/sh\n\n".
+        "unset SESSION_MANAGER\n".
+        "unset DBUS_SESSION_BUS_ADDRESS\n".
+-       "OS=`uname -s`\n".
+-       "if [ \$OS = 'Linux' ]; then\n".
+-       "  case \"\$WINDOWMANAGER\" in\n".
+-       "    \*gnome\*)\n".
+-       "      if [ -e /etc/SuSE-release ]; then\n".
+-       "        PATH=\$PATH:/opt/gnome/bin\n".
+-       "        export PATH\n".
+-       "      fi\n".
+-       "      ;;\n".
+-       "  esac\n".
++       "\n".
++       "userclientrc=\$HOME/.xinitrc\n".
++       "sysclientrc=/etc/X11/xinit/xinitrc\n".
++       "\n".
++       "if [ -f \"\$userclientrc\" ]; then\n".
++       "  client=\"\$userclientrc\"\n".
++       "elif [ -f \"\$sysclientrc\" ]; then\n".
++       "  client=\"\$sysclientrc\"\n".
+        "fi\n".
+-       "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
+-       "  exec /etc/X11/xinit/xinitrc\n".
++       "\n".
++       "if [ -x \"\$client\" ]; then\n".
++       "  exec \"\$client\"\n".
+        "fi\n".
+-       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
+-       "  exec sh /etc/X11/xinit/xinitrc\n".
++       "if [ -f \"\$client\" ]; then\n".
++       "  exec sh \"\$client\"\n".
+        "fi\n".
++       "\n".
+        "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
+        "xsetroot -solid grey\n".
+        "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
+-       "twm &\n");
++       "if [ -x /usr/bin/twm ]; then\n".
++       "  /usr/bin/twm &\n".
++       "else\n".
++       "  echo \"No window manager found. You should install a window manager to get properly working VNC session.\"\n".
++       "fi\n");
+ 
+ chop($host = `uname -n`);
+