diff --git a/Makefile b/Makefile
index 2549d84d9..b50aa8369 100644
--- a/Makefile
+++ b/Makefile
@@ -773,6 +773,7 @@ uninstall:	uninstall-i18n
 	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
 	-rm -f -r $(CONFDIR)
 	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+	-rm $(COMPLETIONDIR)/010_tuxpaint-completion.bash
 	-rm -r $(MAGIC_PREFIX)
 	-rm -r $(INCLUDE_PREFIX)/tuxpaint
 	-rm $(BIN_PREFIX)/tp-magic-config
@@ -815,13 +816,18 @@ install-default-config:
 	@chmod 644 $(CONFDIR)/tuxpaint.conf
 
 # Install BASH completion file:
+# (Per https://sourceforge.net/p/tuxpaint/bugs/290/ naming
+# in such a way that buggy bash-completion won't end up
+# looking at our file before "000_bash_completion_compat.bash"
+# under certain locales, due to different sorting / LC_COLLATE,
+# and hence `have` being unavailable.)
 .PHONY: install-bash-completion
 install-bash-completion:
 	@echo
 	@echo "...Installing BASH completion file..."
 	@install -d $(COMPLETIONDIR)
-	@cp src/tuxpaint-completion.bash $(COMPLETIONDIR)
-	@chmod 644 $(COMPLETIONDIR)/tuxpaint-completion.bash
+	@cp src/tuxpaint-completion.bash $(COMPLETIONDIR)/010_tuxpaint-completion.bash
+	@chmod 644 $(COMPLETIONDIR)/010_tuxpaint-completion.bash
 
 
 # Install example stamps
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 23ee5de75..42ac101b8 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -6,7 +6,7 @@ Copyright (c) 2002-2024
 Various contributors (see below, and AUTHORS.txt)
 https://tuxpaint.org/
 
-2024.July.4 (0.9.33)
+2024.July.5 (0.9.33)
   * New Magic Tools:
     ----------------
     * Dither & Dither (Keep Color): Replaces all or part of a drawing
@@ -109,7 +109,11 @@ https://tuxpaint.org/
     * Make screen refresh more snappy on macOS.
       Mark Kim <markuskimius@gmail.com>
 
-    * Replace `have` with `_have` in Tux Paint's BASH completion script.
+    * Replace `have` with `_have` in Tux Paint's BASH completion script,
+      and rename as `010_tuxpaint-completion.bash` when installing, to
+      ensure `have` exists via `000_bash_completion_compat.bash`; under
+      some locales (LC_COLLATE), that could get ran _after_ Tux Paint's,
+      due to this bug: https://github.com/scop/bash-completion/issues/1207)
       Closes https://sourceforge.net/p/tuxpaint/bugs/290/
       (h/t Jozef Riha for reporting)
       Bill Kendrick <bill@newbreedsoftware.com>