diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 44e60140c..e8bb5543f 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -75,6 +75,8 @@ https://tuxpaint.org/
     ----------------------
     * Troubleshooting Guide (TROUBLESHOOTING.txt) updated regarding
       + macOS (h/t Mark Kim)
+      + Haiku (h/t Luc Schrijvers)
+      + Linux (Bill K.)
 
   * Localization Updates:
     ---------------------
diff --git a/docs/TROUBLESHOOTING.txt b/docs/TROUBLESHOOTING.txt
index dc3c72817..8464b9ad9 100644
--- a/docs/TROUBLESHOOTING.txt
+++ b/docs/TROUBLESHOOTING.txt
@@ -54,10 +54,23 @@ Linux
  * The Linux distro and version (e.g., Ubuntu 22.04, RHEL 9, etc.)
  * The version of Tux Paint (e.g., "0.9.28-3")
  * The source of Tux Paint -- built from source code, installed
-   from distro's software repository, direct package file download
-   (.rpm), Flatpak, etc.
- * Send a copy of the config file, e.g. ".tuxpaintrc" in $HOME
+   from your distro's software repository, installed via Flatpak,
+   installed using a direct package file download (.rpm), etc.
+ * Send a copy of the config file(s)
+   - $HOME/.tuxpaintrc
+   - [/usr/local]/etc/tuxpaint/tuxpaint.conf
  * Any output seen on a terminal when running "tuxpaint" from
-   a command-line
- * FIXME -- Anything else?
+   a command-line (the output of stdout and/or stderr)
+
+Haiku
+-----
+ * The Haiku version and CPU version (e.g., R1B4/nightly, 32bit/64bit)
+ * The version of Tux Paint (e.g., "0.9.28-3")
+ * The source of Tux Paint -- built from source code, installed
+   from distro's software repository (pkgman/HaikuDepot), direct
+   package file download (.hpkg), etc.
+ * Send a copy of the config file, e.g. ".tuxpaint.conf" in
+   /boot/home/config/settings/TuxPaint
+ * Any output seen on a terminal when running
+   "/boot/system/apps/TuxPaint/TuxPaint" from a command-line