diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index b9139595b4..32191a325f 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2812,6 +2812,15 @@ HolyC:
   codemirror_mode: clike
   codemirror_mime_type: text/x-csrc
   language_id: 928121743
+Hosts File:
+  type: data
+  color: "#308888"
+  filenames:
+  - HOSTS
+  - hosts
+  tm_scope: source.hosts
+  ace_mode: text
+  language_id: 231021894
 Hy:
   type: programming
   ace_mode: text
@@ -2870,7 +2879,9 @@ INI:
   - ".coveragerc"
   - ".flake8"
   - ".pylintrc"
+  - HOSTS
   - buildozer.spec
+  - hosts
   - pylintrc
   tm_scope: source.ini
   aliases:
diff --git a/samples/Hosts File/filenames/hosts b/samples/Hosts File/filenames/hosts
new file mode 100644
index 0000000000..54cf4f1e00
--- /dev/null
+++ b/samples/Hosts File/filenames/hosts	
@@ -0,0 +1,2 @@
+127.0.0.1 localhost
+::1       localhost
diff --git a/samples/INI/filenames/hosts b/samples/INI/filenames/hosts
new file mode 100644
index 0000000000..b08cb84337
--- /dev/null
+++ b/samples/INI/filenames/hosts
@@ -0,0 +1,13 @@
+[dev]
+dev-rhel8-55 ansible_host=192.168.100.4 
+
+[nodes]
+node1 ansible_host=192.168.56.25
+
+[nodes:vars] 
+ansible_ssh_private_key_file=/home/ansible/.ssh/id_rsa  
+ansible_user=devops 
+
+[dev:vars]
+ansible_ssh_private_key_file=/home/ansible/.ssh/id_rsa 
+ansible_user=devops
diff --git a/test/test_samples.rb b/test/test_samples.rb
index d2a1c5c9e2..9807a3410f 100644
--- a/test/test_samples.rb
+++ b/test/test_samples.rb
@@ -46,6 +46,7 @@ def test_filename_listed
     Samples.each do |sample|
       if sample[:filename]
         listed_filenames = Language[sample[:language]].filenames
+        listed_filenames -= ["HOSTS"] if ["Hosts File", "INI"].include?(sample[:language])
         assert_includes listed_filenames, sample[:filename], "#{sample[:path]} isn't listed as a filename for #{sample[:language]} in languages.yml"
       end
     end
@@ -90,6 +91,9 @@ def test_filename_listed
       end
 
       language.filenames.each do |filename|
+        # Kludge for an unusual edge-case; see https://bit.ly/41EyUkU
+        next if ["Hosts File", "INI"].include?(language.name) && filename == "HOSTS"
+
         # Check for samples if more than one language matches the given filename
         if Language.find_by_filename(filename).size > 1
           sample = "samples/#{language.name}/filenames/#{filename}"
@@ -99,7 +103,7 @@ def test_filename_listed
       end
     end
   end
-  
+
   def case_insensitive_glob(extension)
     glob = ""
     extension.each_char do |c|
diff --git a/vendor/README.md b/vendor/README.md
index f94010a8a5..613e9871df 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -236,6 +236,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Haxe:** [vshaxe/haxe-TmLanguage](https://github.com/vshaxe/haxe-TmLanguage)
 - **HiveQL:** [adidonato/language-hql](https://github.com/adidonato/language-hql)
 - **HolyC:** [codingdandy/holyc.tmbundle](https://github.com/codingdandy/holyc.tmbundle)
+- **Hosts File:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
 - **Hy:** [tshakalekholoane/vscode-hy](https://github.com/tshakalekholoane/vscode-hy)
 - **IDL:** [mgalloy/idl.tmbundle](https://github.com/mgalloy/idl.tmbundle)
 - **IGOR Pro:** [byte-physics/language-igor](https://github.com/byte-physics/language-igor)
diff --git a/vendor/grammars/language-etc b/vendor/grammars/language-etc
index 3105677722..e20bdb2572 160000
--- a/vendor/grammars/language-etc
+++ b/vendor/grammars/language-etc
@@ -1 +1 @@
-Subproject commit 3105677722c633c6d2c4220c560332cf5c732b91
+Subproject commit e20bdb25727c1c2828372d065d752aeeb9ee39dd
diff --git a/vendor/licenses/git_submodule/language-etc.dep.yml b/vendor/licenses/git_submodule/language-etc.dep.yml
index 96b8243bc2..2630948d44 100644
--- a/vendor/licenses/git_submodule/language-etc.dep.yml
+++ b/vendor/licenses/git_submodule/language-etc.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: language-etc
-version: 3105677722c633c6d2c4220c560332cf5c732b91
+version: e20bdb25727c1c2828372d065d752aeeb9ee39dd
 type: git_submodule
 homepage: https://github.com/Alhadis/language-etc
 license: isc