diff --git a/change-notes/1.21/extractor-javascript.md b/change-notes/1.21/extractor-javascript.md
new file mode 100644
index 00000000000..0f6fd996a72
--- /dev/null
+++ b/change-notes/1.21/extractor-javascript.md
@@ -0,0 +1,7 @@
+[[ condition: enterprise-only ]]
+
+# Improvements to JavaScript analysis
+
+## Changes to code extraction
+
+* YAML files are now extracted by default on LGTM. You can specify exclusion filters in your `lgtm.yml` file to override this behavior.
diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
index f599617c14d..61093e7bdb4 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -128,6 +128,8 @@ import java.util.stream.Stream;
  *       FileType#JS} (currently ".js", ".jsx", ".mjs", ".es6", ".es").
  *   <li>All HTML files, that is, files with with one of the extensions supported by {@link
  *       FileType#HTML} (currently ".htm", ".html", ".xhtm", ".xhtml", ".vue").
+ *   <li>All YAML files, that is, files with one of the extensions supported by {@link
+ *       FileType#YAML} (currently ".raml", ".yaml", ".yml").
  *   <li>Files with base name "package.json".
  *   <li>JavaScript, JSON or YAML files whose base name starts with ".eslintrc".
  *   <li>All extension-less files.
@@ -338,10 +340,11 @@ public class AutoBuild {
     // exclude all files with extensions
     patterns.add("-**/*.*");
 
-    // but include HTML, JavaScript and (optionally) TypeScript
+    // but include HTML, JavaScript, YAML and (optionally) TypeScript
     Set<FileType> defaultExtract = new LinkedHashSet<FileType>();
     defaultExtract.add(FileType.HTML);
     defaultExtract.add(FileType.JS);
+    defaultExtract.add(FileType.YAML);
     if (typeScriptMode != TypeScriptMode.NONE) defaultExtract.add(FileType.TYPESCRIPT);
     for (FileType filetype : defaultExtract)
       for (String extension : filetype.getExtensions()) patterns.add("**/*" + extension);
diff --git a/javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java b/javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java
index 52bc65f2501..f5155cca224 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java
@@ -491,4 +491,12 @@ public class AutoBuildTests {
       Assert.assertEquals("Invalid file type 'javascript'.", ue.getMessage());
     }
   }
+
+  @Test
+  public void includeYaml() throws IOException {
+    addFile(true, LGTM_SRC, "tst.yaml");
+    addFile(true, LGTM_SRC, "tst.yml");
+    addFile(true, LGTM_SRC, "tst.raml");
+    addFile(true, LGTM_SRC, "tst2.YML");
+  }
 }