diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d0dae923..6242795e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,8 +24,8 @@ elseif (_GLFW_WIN32)
 elseif (_GLFW_X11)
     set(glfw_HEADERS ${common_HEADERS} x11_platform.h)
     set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_gamma.c x11_init.c
-                     x11_joystick.c x11_keysym2unicode.c x11_monitor.c
-                     x11_time.c x11_window.c)
+                     x11_joystick.c x11_monitor.c x11_time.c x11_window.c
+                     x11_unicode.c)
 endif()
 
 if (_GLFW_EGL)
diff --git a/src/x11_keysym2unicode.c b/src/x11_unicode.c
similarity index 100%
rename from src/x11_keysym2unicode.c
rename to src/x11_unicode.c
diff --git a/src/x11_window.c b/src/x11_window.c
index c9878920..6267e145 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -71,7 +71,7 @@ static int translateChar(XKeyEvent* event)
     // Get X11 keysym
     XLookupString(event, NULL, 0, &keysym, NULL);
 
-    // Convert to Unicode (see x11_keysym2unicode.c)
+    // Convert to Unicode (see x11_unicode.c)
     return (int) _glfwKeySym2Unicode(keysym);
 }