diff --git a/src/hint-data/fetch/mkosi.ts b/src/hint-data/fetch/mkosi.ts
new file mode 100644
index 0000000..b8ef55a
--- /dev/null
+++ b/src/hint-data/fetch/mkosi.ts
@@ -0,0 +1,165 @@
+import { resolve } from "path";
+import { cacheDir, manifestDir } from "../../config/fs";
+import { JsonFileWriter, SimpleHttpCache, getText } from "../../utils/crawler-utils";
+import {
+    ManifestItem,
+    ManifestItemForDirective,
+    ManifestItemForDocsMarkdown,
+    ManifestItemForSpecifier,
+    ManifestItemType,
+    PredefinedSignature,
+} from "../types-manifest";
+import { extractDirectiveSignature, isBooleanArgument } from "./utils/directive-signature";
+import { manpageURLs } from "../manpage-url";
+import { findFirst, getTokensInSection, markdownLexer, toPlainText } from "../../utils/markdown-utils";
+import type { Token, Tokens } from "marked";
+
+const url = manpageURLs.mkosi;
+const targetFile = resolve(manifestDir, "mkosi.json");
+
+let jsonFile: JsonFileWriter<ManifestItem> | undefined;
+main().catch((error) => {
+    if (jsonFile) jsonFile.close();
+    console.error(error.stack);
+});
+async function main() {
+    SimpleHttpCache.init(cacheDir);
+
+    const pathnames = new URL(url).pathname.split("/");
+    const manPageName = pathnames[pathnames.length - 1];
+    const manPageIndex = 1;
+    let nextDocsId = 1;
+    let nextSectionId = 1;
+
+    const markdown = await getText("mkosi.md", url);
+    const markdownTokens = markdownLexer(markdown);
+    jsonFile = new JsonFileWriter<ManifestItem>(targetFile);
+    jsonFile.writeItem([
+        ManifestItemType.ManPageInfo,
+        manPageIndex,
+        manPageName,
+        "mkosi - Build Bespoke OS Images",
+        url,
+    ]);
+
+    //#region Specifiers
+    let h2 = findFirst<Tokens.Heading>(
+        markdownTokens,
+        {
+            heading: 2,
+            text: "Specifiers",
+        },
+        "REQUIRED"
+    );
+    const allSpecifiers: ManifestItemForSpecifier[] = [];
+    const tables: Tokens.Table[] = getTokensInSection(markdownTokens, h2.index).filter(
+        (it) => it.type === "table"
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) as any[];
+    for (const table of tables) {
+        const { header, rows } = table;
+        const specifierIndex = header.findIndex((it) => toPlainText(it.tokens).trim().toLowerCase() === "specifier");
+        if (specifierIndex < 0) continue;
+        for (const row of rows) {
+            const specNameCol = row.splice(specifierIndex, 1);
+            if (!specNameCol) throw new Error(`Invalid row for specifiers: ${table.raw}`);
+            const specName = toPlainText(specNameCol[0].tokens);
+            const specDocs = row.map((it) => toPlainText(it.tokens)).join("\n");
+
+            const mtx = specName.match(/^%(.)$/);
+            if (!mtx) throw new Error(`Invalid specifier name "${specName}"`);
+            allSpecifiers.push([ManifestItemType.Specifier, mtx[1], specDocs, ""]);
+        }
+    }
+    allSpecifiers.sort((a, b) => (a[1] > b[1] ? 1 : -1));
+    jsonFile.writeItems(allSpecifiers);
+    //#endregion Specifiers
+
+    h2 = findFirst<Tokens.Heading>(
+        markdownTokens,
+        {
+            heading: 2,
+            text: "Configuration Settings",
+        },
+        "REQUIRED"
+    );
+    for (let i = h2.index; i < markdownTokens.length; i++) {
+        const h3 = findFirst<Tokens.Heading>(markdownTokens, {
+            after: i,
+            heading: 3,
+            notInNewSection: true,
+        });
+        if (!h3) break;
+
+        const h3text = h3.token.text;
+        const mtx = h3text.match(/^\s*\[([\w-]+)\]\s+section/i);
+        if (!mtx) throw new Error(`Invalid h3 text "${h3text}"`);
+
+        const [, sectionName] = mtx;
+        const sectionRefId = manPageName + "#" + getLinkId(h3text || "");
+
+        const sectionId = nextSectionId++;
+        jsonFile.writeItem([ManifestItemType.Section, sectionId, sectionName]);
+
+        const tokens = getTokensInSection(markdownTokens, h3.index);
+        const isDirectiveToken = (token: Token): token is Tokens.Paragraph =>
+            token.type === "paragraph" && token.raw.startsWith("`");
+
+        const allDocs: ManifestItemForDocsMarkdown[] = [];
+        const allDirectives: ManifestItemForDirective[] = [];
+        for (let j = 0; j < tokens.length; j++) {
+            const directiveToken = tokens[j];
+            if (!isDirectiveToken(directiveToken)) continue;
+
+            const title = toPlainText(directiveToken.tokens || []);
+            const signs = extractDirectiveSignature(title);
+            // const directives = title.split(/,\s*/).filter((it) => !/^(?:--|-\w$)/.test(it));
+            // console.log(directives);
+
+            const _docs: string[] = [];
+            while (++j < tokens.length) {
+                if (isDirectiveToken(tokens[j])) break;
+                _docs.push(tokens[j].raw);
+            }
+            j--;
+
+            const docs = _docs.join("").trim().replace(/^:\s+/, "");
+            const docsText = toPlainText(markdownLexer(docs));
+            const currentDocsIndex = nextDocsId++;
+            allDocs.push([ManifestItemType.DocsMarkdown, currentDocsIndex, docs, sectionRefId]);
+
+            for (const sign of signs) {
+                // console.log(sign.name, sign.params);
+                let signParams: string[] | PredefinedSignature | undefined;
+                if (isBooleanArgument(docsText))
+                    signParams = /\s+or\s+auto\W/.test(docsText)
+                        ? PredefinedSignature.BooleanOrAuto
+                        : PredefinedSignature.Boolean;
+
+                allDirectives.push([
+                    ManifestItemType.Directive,
+                    sign.name,
+                    signParams || sign.params,
+                    currentDocsIndex,
+                    manPageIndex,
+                    sectionId,
+                ]);
+            }
+        }
+        allDirectives.sort((a, b) => (a[1] > b[1] ? 1 : -1));
+        jsonFile.writeItems(allDocs);
+        jsonFile.writeItems(allDirectives);
+
+        i = h3.index - 1;
+    }
+
+    jsonFile.close();
+    return;
+
+    function getLinkId(text: string) {
+        return text
+            .replace(/(?:^\W+|\W+$)/g, "")
+            .replace(/\W+/g, "-")
+            .toLowerCase();
+    }
+}
diff --git a/src/hint-data/fetch/utils/directive-signature.ts b/src/hint-data/fetch/utils/directive-signature.ts
index 3266850..b2a07ad 100644
--- a/src/hint-data/fetch/utils/directive-signature.ts
+++ b/src/hint-data/fetch/utils/directive-signature.ts
@@ -28,6 +28,7 @@ export function extractDirectiveSignature(signatureString: string): ReadonlyArra
     const result = new Map<string, string[]>();
     for (const part of signatureString.split(/,\s+/)) {
         if (part.startsWith("--")) continue; // cli options
+        if (/^-\w$/.test(part)) continue; // cli options
         if (part.match(/^\$\w+(?:=\w*)?$/)) continue; // environment variables
         const mtx = part.match(/^([^\[=]+)(?:=(.*)|\[=\])?$/);
         if (!mtx) throw new Error(`Invalid directive "${signatureString}"`);
diff --git a/src/hint-data/manpage-url.ts b/src/hint-data/manpage-url.ts
index 10a7b3d..137f615 100644
--- a/src/hint-data/manpage-url.ts
+++ b/src/hint-data/manpage-url.ts
@@ -25,6 +25,9 @@ export const manpageURLs = {
     podman: "https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html",
     podmanBase: "https://docs.podman.io/en/latest/markdown/",
     //
+    mkosi: "https://raw.githubusercontent.com/systemd/mkosi/main/mkosi/resources/mkosi.md",
+    mkosiBase: "https://github.com/systemd/mkosi/blob/main/mkosi/resources/",
+    //
     capabilities: "https://man7.org/linux/man-pages/man7/capabilities.7.html",
     capabilitiesBase: "https://man7.org/linux/man-pages/man7/",
 };
diff --git a/src/hint-data/types-manifest.ts b/src/hint-data/types-manifest.ts
index 414308d..c79a15f 100644
--- a/src/hint-data/types-manifest.ts
+++ b/src/hint-data/types-manifest.ts
@@ -21,6 +21,7 @@ export type ManifestItem =
 
 export const enum PredefinedSignature {
     Boolean = "b",
+    BooleanOrAuto = "B",
 }
 export type ManifestItemForDirective = [
     type: ManifestItemType.Directive,