diff --git a/index.vnc b/index.vnc
new file mode 100644
index 0000000..07cacb3
--- /dev/null
+++ b/index.vnc
@@ -0,0 +1,21 @@
+
+
+
+
+$USER's $DESKTOP desktop ($DISPLAY)
+
+
+
+TigerVNC site
+
diff --git a/tigervnc.changes b/tigervnc.changes
index 3fd5504..373f998 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar 17 13:47:18 UTC 2014 - msrb@suse.com
+
+- Update HTML page that serves vnc client applet. (bnc#867273)
+- u_tigervnc-dont-send-ascii-control-characters.patch
+ * Send CTRL+[A-Z] combinations instead of ascii control characters.
+ (bnc#864666)
+
-------------------------------------------------------------------
Mon Feb 24 14:42:50 UTC 2014 - msrb@suse.com
diff --git a/tigervnc.spec b/tigervnc.spec
index 8a4d1d1..ae18233 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -92,6 +92,7 @@ Source6: vnc-httpd.firewall
Source7: vnc_inetd_httpd
Source8: vnc.reg
Source9: vncpasswd.arg
+Source10: index.vnc
# Tiger vnc patches
Patch1: u_tigervnc-1.3.0-fix-use-after-free.patch
@@ -99,6 +100,7 @@ Patch2: tigervnc-newfbsize.patch
Patch3: tigervnc-clean-pressed-key-on-exit.patch
Patch4: tigervnc-sf3492352.diff
Patch5: tigervnc-sf3495623.patch
+Patch6: u_tigervnc-dont-send-ascii-control-characters.patch
# Xserver patches
Patch10: tigervnc-1.2.80-fix-int-to-pointer.patch
@@ -136,6 +138,7 @@ fi
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p0
pushd unix/xserver
patch -p1 < ../xserver113.patch
@@ -189,7 +192,6 @@ popd
pushd java
mkdir -p $RPM_BUILD_ROOT%{_datadir}/vnc/classes
install -m755 VncViewer.jar $RPM_BUILD_ROOT%{_datadir}/vnc/classes
-install -m644 com/tigervnc/vncviewer/index.vnc $RPM_BUILD_ROOT%{_datadir}/vnc/classes
popd
install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc
@@ -201,6 +203,7 @@ install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/servi
install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd
install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg
+install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes
%find_lang '%{name}'
diff --git a/u_tigervnc-dont-send-ascii-control-characters.patch b/u_tigervnc-dont-send-ascii-control-characters.patch
new file mode 100644
index 0000000..c6bc781
--- /dev/null
+++ b/u_tigervnc-dont-send-ascii-control-characters.patch
@@ -0,0 +1,24 @@
+Author: Michal Srb
+Subject: Do not send ascii control characters for CTRL+[A-Z] combinations.
+Patch-Mainline: To be upstreamed
+References: bnc#864666
+
+Index: vncviewer/Viewport.cxx
+===================================================================
+--- vncviewer/Viewport.cxx (revision 5162)
++++ vncviewer/Viewport.cxx (working copy)
+@@ -753,7 +753,13 @@
+ return XK_VoidSymbol;
+ }
+
+- ucs = fl_utf8decode(keyText, NULL, NULL);
++ if (keyCode >= 'a' && keyCode <= 'z' && keyText[0] < 0x20) {
++ // Do not send ascii control characters - send the original key combination that caused them.
++ ucs = keyCode;
++ } else {
++ ucs = fl_utf8decode(keyText, NULL, NULL);
++ }
++
+ return ucs2keysym(ucs);
+ }
+
diff --git a/vnc_inetd_httpd b/vnc_inetd_httpd
index 390b07f..bc54c81 100644
--- a/vnc_inetd_httpd
+++ b/vnc_inetd_httpd
@@ -23,8 +23,10 @@ case "$url" in
content="
Remote Desktop
-