diff --git a/.gitignore b/.gitignore
index 6260fc02f..7e52fc487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 /modulecmd.tcl
 /ChangeLog*
 /README
-/CLAUDE.md
 /GEMINI.md
 /Makefile.inc
 /version.inc
diff --git a/AGENTS.md b/AGENTS.md
index fbc40f16d..e39aa6238 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,10 +1,10 @@
 # AGENTS.md
 
 This file provides guidance to AI coding assistants when working with code
-in this repository. Codex and Mistral Vibe read it directly. Claude Code and
-Gemini CLI only look for their own `CLAUDE.md`/`GEMINI.md` filename, so both
-are generated as stubs that just import this file (see the `CLAUDE.md:` and
-`GEMINI.md:` rules in `Makefile`).
+in this repository. Codex, Claude Code and Mistral Vibe read it directly.
+Gemini CLI only looks for its own `GEMINI.md` filename, so it is generated
+as a stub that just imports this file (see the `GEMINI.md:` rule in
+`Makefile`).
 
 ## What this is
 
diff --git a/Makefile b/Makefile
index 7b500e387..5b78ad141 100644
--- a/Makefile
+++ b/Makefile
@@ -646,14 +646,9 @@ README:
 	sed -e '181,187d' -e '1,10d' -e 's|\[\(.*\?\)\]\[[0-9]\]|\1|' $@.md > $@
 
 # AGENTS.md (https://agents.md) is the single source of instructions for AI
-# coding assistants working in this repository. Codex and Mistral Vibe read
-# it directly, but Claude Code and Gemini CLI only look for their own
-# CLAUDE.md/GEMINI.md filename, so generate a stub for each that just
-# imports AGENTS.md
-CLAUDE.md: AGENTS.md
-	$(ECHO_GEN)
-	echo '@AGENTS.md' > $@
-
+# coding assistants working in this repository. Codex, Claude Code and
+# Mistral Vibe read it directly, but Gemini CLI only looks for its own
+# GEMINI.md filename, so generate a stub that just imports AGENTS.md
 GEMINI.md: AGENTS.md
 	$(ECHO_GEN)
 	echo '@AGENTS.md' > $@
@@ -961,7 +956,6 @@ ifeq ($(wildcard .git),.git)
 	rm -f ChangeLog*
 endif
 	rm -f README
-	rm -f CLAUDE.md
 	rm -f GEMINI.md
 	rm -f modulecmd.tcl
 	rm -f $(MODULECMDTEST) $(MODULECMDTEST)_i
@@ -1220,7 +1214,7 @@ $(V).SILENT: initdir pkgdoc doc version.inc share/rpm/environment-modules.spec \
 	tcl/cache.tcl_i tcl/coll.tcl_i tcl/envmngt.tcl_i tcl/init.tcl_i tcl/interp.tcl_i \
 	tcl/main.tcl_i tcl/mfcmd.tcl_i tcl/modfind.tcl_i tcl/modeval.tcl_i \
 	tcl/modscan.tcl_i tcl/modspec.tcl_i tcl/report.tcl_i tcl/subcmd.tcl_i \
-	tcl/util.tcl_i ChangeLog ChangeLog.gz README CLAUDE.md GEMINI.md \
+	tcl/util.tcl_i ChangeLog ChangeLog.gz README GEMINI.md \
 	script/add.modules script/gitlog2changelog.py script/modulecmd \
 	lib/libtclenvmodules$(SHLIB_SUFFIX) lib/libtestutil-closedir$(SHLIB_SUFFIX) \
 	lib/libtestutil-getpwuid$(SHLIB_SUFFIX) lib/libtestutil-getgroups$(SHLIB_SUFFIX) \