diff --git a/indiekit.config.mjs b/indiekit.config.mjs
index 030d7885..f714ceb2 100644
--- a/indiekit.config.mjs
+++ b/indiekit.config.mjs
@@ -228,6 +228,12 @@ export default {
           path: "content/notes/{slug}.md",
           url: `${publicationBaseUrl}/notes/{slug}/`,
         },
+        fields: {
+          aiTextLevel: {},
+          aiCodeLevel: {},
+          aiTools: {},
+          aiDescription: {},
+        },
       },
       bookmark: {
         name: "Lesezeichen",
diff --git a/scripts/patch-preset-eleventy-ai-frontmatter.mjs b/scripts/patch-preset-eleventy-ai-frontmatter.mjs
index a3f2b443..845ae70a 100644
--- a/scripts/patch-preset-eleventy-ai-frontmatter.mjs
+++ b/scripts/patch-preset-eleventy-ai-frontmatter.mjs
@@ -7,9 +7,10 @@ const candidates = [
   "node_modules/@indiekit/indiekit/node_modules/@indiekit/preset-eleventy/lib/post-template.js",
 ];
 
-const patchMarker = "Normalize AI disclosure metadata and default to no AI usage.";
+const patchMarker =
+  "Normalize AI disclosure metadata for articles and notes only, defaulting to no AI usage.";
 
-const oldBlock = [
+const upstreamBlock = [
   "  // Convert url to Eleventy permalink so generated URL matches Indiekit's stored URL",
   "  // Add trailing slash to generate /path/index.html instead of /path.html",
   "  if (properties.url) {",
@@ -23,7 +24,7 @@ const oldBlock = [
   "};",
 ].join("\n");
 
-const newBlock = [
+const v1PatchedBlock = [
   "  // Convert url to Eleventy permalink so generated URL matches Indiekit's stored URL",
   "  // Add trailing slash to generate /path/index.html instead of /path.html",
   "  if (properties.url) {",
@@ -79,6 +80,71 @@ const newBlock = [
   "};",
 ].join("\n");
 
+const v2Block = [
+  "  // Convert url to Eleventy permalink so generated URL matches Indiekit's stored URL",
+  "  // Add trailing slash to generate /path/index.html instead of /path.html",
+  "  if (properties.url) {",
+  "    const url = properties.url;",
+  "    properties.permalink = url.endsWith(\"/\") ? url : `${url}/`;",
+  "  }",
+  "  delete properties.url;",
+  "",
+  "  // Normalize AI disclosure metadata for articles and notes only, defaulting to no AI usage.",
+  "  const aiSource =",
+  "    properties.ai && typeof properties.ai === \"object\" && !Array.isArray(properties.ai)",
+  "      ? properties.ai",
+  "      : {};",
+  "",
+  "  const aiTextLevel = String(",
+  "    aiSource.textLevel ?? aiSource.aiTextLevel ?? properties.aiTextLevel ?? \"0\",",
+  "  );",
+  "",
+  "  const aiCodeLevel = String(",
+  "    aiSource.codeLevel ?? aiSource.aiCodeLevel ?? properties.aiCodeLevel ?? \"0\",",
+  "  );",
+  "",
+  "  const aiTools = aiSource.aiTools ?? aiSource.tools ?? properties.aiTools;",
+  "",
+  "  const aiDescription =",
+  "    aiSource.aiDescription ?? aiSource.description ?? properties.aiDescription;",
+  "",
+  "  delete properties.ai;",
+  "  delete properties.aiTextLevel;",
+  "  delete properties.aiCodeLevel;",
+  "  delete properties.aiTools;",
+  "  delete properties.aiDescription;",
+  "",
+  "  const postType = String(",
+  "    properties.postType ?? properties[\"post-type\"] ?? \"\",",
+  "  ).toLowerCase();",
+  "  const supportsAiDisclosure = postType === \"article\" || postType === \"note\";",
+  "",
+  "  const frontMatter = YAML.stringify(properties, { lineWidth: 0 });",
+  "",
+  "  if (!supportsAiDisclosure) {",
+  "    return `---\\n${frontMatter}---\\n`;",
+  "  }",
+  "",
+  "  let aiFrontMatter = `ai:\\n  textLevel: \\\"${aiTextLevel}\\\"\\n  codeLevel: \\\"${aiCodeLevel}\\\"\\n  # aiTools: \\\"Claude, ChatGPT, Copilot\\\"\\n  # aiDescription: \\\"Optional disclosure about how AI was used\\\"\\n`;",
+  "",
+  "  if (aiTools !== undefined && aiTools !== null && aiTools !== \"\") {",
+  "    aiFrontMatter = aiFrontMatter.replace(",
+  "      '  # aiTools: \\\"Claude, ChatGPT, Copilot\\\"\\n',",
+  "      `  aiTools: ${JSON.stringify(String(aiTools))}\\n`,",
+  "    );",
+  "  }",
+  "",
+  "  if (aiDescription !== undefined && aiDescription !== null && aiDescription !== \"\") {",
+  "    aiFrontMatter = aiFrontMatter.replace(",
+  "      '  # aiDescription: \\\"Optional disclosure about how AI was used\\\"\\n',",
+  "      `  aiDescription: ${JSON.stringify(String(aiDescription))}\\n`,",
+  "    );",
+  "  }",
+  "",
+  "  return `---\\n${frontMatter}${aiFrontMatter}---\\n`;",
+  "};",
+].join("\n");
+
 async function exists(filePath) {
   try {
     await access(filePath);
@@ -104,14 +170,19 @@ for (const filePath of candidates) {
     continue;
   }
 
-  if (!source.includes(oldBlock)) {
+  let updated = source;
+
+  if (source.includes(v1PatchedBlock)) {
+    updated = source.replace(v1PatchedBlock, v2Block);
+  } else if (source.includes(upstreamBlock)) {
+    updated = source.replace(upstreamBlock, v2Block);
+  } else {
     console.warn(
       `[postinstall] Skipping preset-eleventy AI frontmatter patch for ${filePath}: upstream format changed`,
     );
     continue;
   }
 
-  const updated = source.replace(oldBlock, newBlock);
   await writeFile(filePath, updated, "utf8");
   patched += 1;
 }