diff --git a/tigervnc-1.8.0-nowindows.patch b/tigervnc-1.8.0-nowindows.patch
new file mode 100644
index 0000000..fa92f5e
--- /dev/null
+++ b/tigervnc-1.8.0-nowindows.patch
@@ -0,0 +1,12 @@
+--- tigervnc-1.8.0/java/com/tigervnc/vncviewer/F8Menu.java	2017-12-18 15:47:56.544658662 +0100
++++ tigervnc-1.8.0/java/com/tigervnc/vncviewer/F8Menu.java	2017-12-18 15:54:53.002571101 +0100
+@@ -40,9 +40,6 @@
+   public F8Menu(CConn cc) {
+     super("VNC Menu");
+     setLightWeightPopupEnabled(false);
+-    String os = System.getProperty("os.name");
+-    if (os.startsWith("Windows"))
+-      com.sun.java.swing.plaf.windows.WindowsLookAndFeel.setMnemonicHidden(false);
+     this.cc = cc;
+     restore    = addMenuItem("Restore",KeyEvent.VK_R);
+     restore.setEnabled(!embed.getValue());
diff --git a/tigervnc.changes b/tigervnc.changes
index 10e63fb..c8bba3a 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Dec 18 16:44:20 UTC 2017 - dimstar@opensuse.org
+
+- Do not mess with /usr/lib*64)?/debug: this is RPM's playground
+  for debuginfo packages.
+
+-------------------------------------------------------------------
+Mon Dec 18 14:56:17 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * tigervnc-1.8.0-nowindows.patch
+    + Remove Windows code that is removed from jdk10
+
 -------------------------------------------------------------------
 Tue Dec 12 13:15:25 UTC 2017 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 91ae2b0..dd1be90 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -131,6 +131,7 @@ Patch9:         U_allow_multiple_certs_with_same_dn_in_saved_certs_file.patch
 Patch10:        U_handle_certificate_verification_for_saved_certs_correctly.patch
 Patch11:        u_tigervnc-add-autoaccept-parameter.patch
 Patch12:        u_Unset-pixel-buffer-when-x0vncserver-client-disconnect.patch
+Patch13:        tigervnc-1.8.0-nowindows.patch
 
 %description
 TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), 
@@ -227,6 +228,7 @@ cp -r /usr/src/xserver/* unix/xserver/
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 pushd unix/xserver
 patch -p1 < ../xserver119.patch
@@ -446,10 +448,6 @@ usermod -G shadow -a %{vncuser} || :
 
 %config %{_sysconfdir}/pam.d/vnc
 
-%exclude /usr/lib/debug/*
-%exclude /usr/lib/debug/.*
-%exclude /usr/src/debug
-
 %dir %attr(0755,%{vncuser},%{vncuser}) %{_sysconfdir}/vnc
 %ghost %attr(0600,%{vncuser},%{vncuser}) %config(noreplace) %{tlskey}
 %ghost %attr(0644,%{vncuser},%{vncuser}) %config(noreplace) %{tlscert}