--- old/src/solaris/classes/sun/awt/X11/XBaseWindow.java	2016-01-27 16:51:01.996023684 -0500
+++ new/src/solaris/classes/sun/awt/X11/XBaseWindow.java	2016-01-27 16:51:01.894022532 -0500
@@ -673,7 +673,7 @@
         XToolkit.awtLock();
         try {
             XAtom xa = XAtom.get(XAtom.XA_WM_CLASS);
-            xa.setProperty8(getWindow(), cl[0] + '\0' + cl[1]);
+            xa.setProperty8(getWindow(), cl[0] + '\0' + cl[1] + '\0');
         } finally {
             XToolkit.awtUnlock();
         }