diff --git a/org.eclipse.tm4e.language_pack/plugin.xml b/org.eclipse.tm4e.language_pack/plugin.xml
index d5bd27346..734827e5d 100644
--- a/org.eclipse.tm4e.language_pack/plugin.xml
+++ b/org.eclipse.tm4e.language_pack/plugin.xml
@@ -144,7 +144,7 @@
   <!-- ======================================== -->
   <extension point="org.eclipse.core.contenttype.contentTypes">
     <content-type id="org.eclipse.tm4e.language_pack.cpp" name="C++" base-type="org.eclipse.tm4e.language_pack.basetype" priority="low"
-                  file-extensions="c++,cc,cpp,cxx,h,h++,h.in,hh,hpp,hpp.in,hxx,ii,inl,ino,ipp,ixx,tpp,txx" />
+                  file-extensions="c++,cc,cpp,cxx,h,h++,hh,hpp,hxx,ii,inl,ino,ipp,ixx,tpp,txx" file-patterns="*.h.in,*.hpp.in" />
   </extension>
   <extension point="org.eclipse.tm4e.registry.grammars">
     <grammar scopeName="source.cpp" path="syntaxes/cpp/cpp.tmLanguage.json" />
@@ -557,7 +557,7 @@
   <!-- ======================================== -->
   <extension point="org.eclipse.core.contenttype.contentTypes">
     <content-type id="org.eclipse.tm4e.language_pack.json" name="JSON" base-type="org.eclipse.tm4e.language_pack.basetype" priority="low"
-                  file-extensions="bowerrc,css.map,geojson,har,ipynb,js.map,jscsrc,jslintrc,json,jsonld,ts.map,vuerc,webmanifest" file-names=".watchmanconfig,composer.lock" />
+                  file-extensions="bowerrc,geojson,har,ipynb,jscsrc,jslintrc,json,jsonld,vuerc,webmanifest" file-names=".watchmanconfig,composer.lock" file-patterns="*.css.map,*.js.map,*.ts.map" />
   </extension>
   <extension point="org.eclipse.tm4e.registry.grammars">
     <grammar scopeName="source.json" path="syntaxes/json/json.tmLanguage.json" />
@@ -577,7 +577,7 @@
   <!-- ======================================== -->
   <extension point="org.eclipse.core.contenttype.contentTypes">
     <content-type id="org.eclipse.tm4e.language_pack.jsonc" name="JSON with Comments" base-type="org.eclipse.tm4e.language_pack.basetype" priority="low"
-                  file-extensions="babelrc,eslintrc,eslintrc.json,hintrc,jsfmtrc,jshintrc,jsonc,swcrc" file-names=".babelrc.json,.ember-cli,babel.config.json,typedoc.json" />
+                  file-extensions="babelrc,eslintrc,hintrc,jsfmtrc,jshintrc,jsonc,swcrc" file-names=".babelrc.json,.ember-cli,babel.config.json,typedoc.json" file-patterns="*.eslintrc.json" />
   </extension>
   <extension point="org.eclipse.tm4e.registry.grammars">
     <grammar scopeName="source.json.comments" path="syntaxes/json/jsonc.tmLanguage.json" />
@@ -1315,7 +1315,7 @@
   <!-- ======================================== -->
   <extension point="org.eclipse.core.contenttype.contentTypes">
     <content-type id="org.eclipse.tm4e.language_pack.xml" name="XML" base-type="org.eclipse.tm4e.language_pack.basetype" priority="low"
-                  file-extensions="ascx,atom,axaml,axml,bpmn,cpt,csl,csproj,csproj.user,dita,ditamap,dtd,dtml,ent,fsproj,fxml,iml,isml,jmx,launch,menu,mod,mxml,nuspec,opml,owl,proj,props,pt,publishsettings,pubxml,pubxml.user,rbxlx,rbxmx,rdf,rng,rss,shproj,storyboard,svg,targets,tld,tmx,vbproj,vbproj.user,vcxproj,vcxproj.filters,wsdl,wxi,wxl,wxs,xaml,xbl,xib,xlf,xliff,xml,xoml,xpdl,xsd,xul" />
+                  file-extensions="ascx,atom,axaml,axml,bpmn,cpt,csl,csproj,dita,ditamap,dtd,dtml,ent,fsproj,fxml,iml,isml,jmx,launch,menu,mod,mxml,nuspec,opml,owl,proj,props,pt,publishsettings,pubxml,rbxlx,rbxmx,rdf,rng,rss,shproj,storyboard,svg,targets,tld,tmx,vbproj,vcxproj,wsdl,wxi,wxl,wxs,xaml,xbl,xib,xlf,xliff,xml,xoml,xpdl,xsd,xul" file-patterns="*.csproj.user,*.pubxml.user,*.vbproj.user,*.vcxproj.filters" />
   </extension>
   <extension point="org.eclipse.tm4e.registry.grammars">
     <grammar scopeName="text.xml" path="syntaxes/xml/xml.tmLanguage.json" />
diff --git a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java
index 0d67c59c7..46190d0ca 100644
--- a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java
+++ b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -374,13 +375,39 @@ private void updatePluginXML() throws IOException {
 				templateVars.put("icon_filename", iconFileName);
 				templateVars.put("example_filename", exampleFile.isPresent() ? exampleFile.get().getFileName() : null);
 
+				List<String> fileExtensions = new ArrayList<>();
+				List<String> fileNames = new ArrayList<>();
+				List<String> filePatterns = new ArrayList<>();
+
+				if (langState.fileExtensions != null) {
+					fileExtensions.addAll(langState.fileExtensions.stream() //
+							.map(Strings::removeLeadingDot) //
+							.filter(e -> !e.contains(".")) // ignore extensions with dot, e.g. html.jinja2
+							.toList());
+
+					filePatterns.addAll(langState.fileExtensions.stream() //
+							.map(Strings::removeLeadingDot) //
+							.filter(e -> e.contains(".")) // select extensions with dot, e.g. html.jinja2
+							.map(e -> "*." + e) // convert them to a pattern, e.g. "*.html.jinja2"
+							.toList());
+				}
+
+				if (langState.fileNames != null) {
+					fileNames.addAll(langState.fileNames);
+				}
+
+				if (langState.filePatterns != null) {
+					filePatterns.addAll(langState.filePatterns);
+				}
+
+				fileExtensions = fileExtensions.stream().distinct().sorted().toList();
+				fileNames = fileNames.stream().distinct().sorted().toList();
+				filePatterns = filePatterns.stream().distinct().sorted().toList();
+
 				templateVars.put("file_associations", Arrays.asList( //
-						isEmpty(langState.fileExtensions) ? null
-								: "file-extensions=\""
-										+ join(langState.fileExtensions.stream().map(Strings::removeLeadingDot).distinct().sorted(), ",")
-										+ "\"", //
-						isEmpty(langState.fileNames) ? null : "file-names=\"" + join(langState.fileNames, ",") + "\"", //
-						isEmpty(langState.filePatterns) ? null : "file-patterns=\"" + join(langState.filePatterns, ",") + "\"" //
+						fileExtensions.isEmpty() ? null : "file-extensions=\"" + join(fileExtensions, ",") + "\"", //
+						fileNames.isEmpty() ? null : "file-names=\"" + join(fileNames, ",") + "\"", //
+						filePatterns.isEmpty() ? null : "file-patterns=\"" + join(filePatterns, ",") + "\"" //
 				).stream().filter(Objects::nonNull).collect(Collectors.joining(" ")));
 
 				pluginLines.append(render(