diff --git a/CHANGES b/CHANGES
index 19e768e70..c0fefdc30 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,14 @@
-CHANGES IN FLTK 1.3.6					RELEASED: ??? ?? 202?
+CHANGES IN FLTK 1.3.6					RELEASED: ??? ?? 2020
 
 Bug fixes and other improvements
 
-  [Note to devs: list created with `git shortlog release-1.3.5..`]
+  Note to devs: the following list was created with:
+    $ git shortlog release-1.3.5.. | sed -e's/^    //'
 
-  Albrecht Schlosser (1):
+  Albrecht Schlosser (3):
     Fix Fl::add_timeout() in draw() under Linux (STR 3188)
+    Fix trailing whitespace in CHANGES
+    X11: Fix X Input Methods (XIM) (STR 3502, 3192)
 
   ManoloFLTK (4):
     X11: add support for copy+paste of image within one app
@@ -13,6 +16,9 @@ Bug fixes and other improvements
     Fix use of Xrender extension with old, 16-bit framebuffers.
     Fix for Fl_Native_File_Chooser under macOS 10.15 Catalina and in BROWSE_SAVE_FILE mode
 
+  OKAMURA, Yasunobu (1):
+    Fix JIS Keyboard dead keys
+
 
 CHANGES IN FLTK 1.3.5					RELEASED: Mar 03 2019
 
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 4a771aecf..141b71cde 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -3,17 +3,17 @@
 //
 // X specific code for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
 // file is missing or damaged, see the license at:
 //
-//     http://www.fltk.org/COPYING.php
+//     https://www.fltk.org/COPYING.php
 //
 // Please report all bugs and problems on the following page:
 //
-//     http://www.fltk.org/str.php
+//     https://www.fltk.org/str.php
 //
 
 #ifdef WIN32
@@ -671,7 +671,7 @@ void fl_open_display() {
   if (fl_display) return;
 
   setlocale(LC_CTYPE, "");
-  XSetLocaleModifiers("@im=");
+  XSetLocaleModifiers("");
 
   XSetIOErrorHandler(io_error_handler);
   XSetErrorHandler(xerror_handler);
@@ -1376,7 +1376,7 @@ int fl_handle(const XEvent& thisevent)
     xim_im = XOpenIM(fl_display, NULL, NULL, NULL);
     if (!xim_im) {
       /*  XIM server has crashed */
-      XSetLocaleModifiers("@im=");
+      XSetLocaleModifiers("");
       fl_xim_im = NULL;
       fl_init_xim();
     } else {