diff --git a/docs/changelog.rst b/docs/changelog.rst
index e3cda3bdb..5ec7f7203 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -56,6 +56,8 @@ Detailed list of changes
 
 - Remote control launch: Fix ``--env`` not implemented when using ``--cwd=current`` with the SSH kitten (:iss:`6438`)
 
+- Allow using a custom OS window icon on X11 as well as macOS (:pull:`6475`)
+
 0.29.0 [2023-07-10]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/faq.rst b/docs/faq.rst
index 5bfb968b9..2fd8f0154 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -346,17 +346,19 @@ homepage:
    :target: https://github.com/eccentric-j/eccentric-icons
    :width: 256
 
-On macOS you can put :file:`kitty.app.icns` or :file:`kitty.app.png` in the
+On macOS and X11 you can put :file:`kitty.app.icns` (macOS only) or :file:`kitty.app.png` in the
 :ref:`kitty configuration directory <confloc>`, and this icon will be applied
-automatically at startup. Unfortunately, Apple's Dock does not change its
-cached icon so the custom icon will revert when kitty is quit. Run the
-following to force the Dock to update its cached icons:
+automatically at startup. On X11, this will set the icon for kitty windows.
+
+Unfortunately, on macOS, Apple's Dock does not change its cached icon so the
+custom icon will revert when kitty is quit. Run the following to force the Dock
+to update its cached icons:
 
 .. code-block:: sh
 
     rm /var/folders/*/*/*/com.apple.dock.iconcache; killall Dock
 
-If you prefer not to keep a custom icon in the kitty config folder, you can
+If you prefer not to keep a custom icon in the kitty config folder, on macOS, you can
 also set it with the following command:
 
 .. code-block:: sh