diff --git a/.github/workflows/sync-dev-with-main.yml b/.github/workflows/sync-dev-with-main.yml
new file mode 100644
index 0000000..82f8076
--- /dev/null
+++ b/.github/workflows/sync-dev-with-main.yml
@@ -0,0 +1,25 @@
+name: Sync dev with main
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [main]
+
+permissions:
+  contents: write
+
+jobs:
+  fast-forward-dev:
+    if: github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'dev'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: dev
+          fetch-depth: 0
+
+      - name: Fast-forward dev to main
+        run: |
+          git fetch origin main
+          git merge --ff-only origin/main
+          git push origin dev
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..36edc61
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,43 @@
+# Contributing
+
+## Branches
+
+| Branch | Purpose |
+|---|---|
+| `main` | Releases only – one merge commit per release, tagged `vX.Y.Z` |
+| `dev` | Integration branch for the next release |
+| `feature/<name>`, `bugfix/<name>` | Work branches, created from `dev` |
+
+1. Create a branch from `dev`: `git switch dev && git pull && git switch -c feature/<name>`.
+2. Open a pull request into `dev`.
+3. Merge it with **Squash and merge** – one commit per feature or fix on `dev`.
+4. Do not commit directly to `main` or `dev`.
+
+## Release
+
+1. Update `APPLICATION_VERSION` in `source/modules/_config_Application.bas` on `dev`
+   (via a `release/X.Y.Z` branch and pull request).
+2. Pull request `dev` -> `main`, merged with **Create a merge commit** (title `Release X.Y.Z`).
+   No squash, so `main` and `dev` keep a shared history. The workflow `sync-dev-with-main.yml`
+   then fast-forwards `dev` to `main`, so no merge back is needed.
+3. Tag the merge commit on `main` and push only this tag:
+   ```
+   git switch main && git pull
+   git tag -a vX.Y.Z -m "Release X.Y.Z"
+   git push origin vX.Y.Z
+   ```
+4. Publish a GitHub release for the tag with the release notes. The workflow
+   `build-release-zip-file.yml` builds the add-in and attaches `ACLibImportWizard_vX.Y.Z.zip`.
+
+`git log --first-parent main` lists the releases only.
+
+## Development
+
+- The add-in is built from the source files in `source/`, exported with the
+  [Version Control add-in](https://github.com/joyfullservice/msaccess-vcs-integration).
+  Do not commit Access binaries (`.accda`, `.accdb`).
+- Edit and export the add-in in a trusted location; import or rebuild from `source/`
+  after editing the source files.
+- Code, comments and commit messages in English; commit subject in imperative mood, max. ~72 characters.
+- Text files use CRLF line endings; keep the encoding of exported files (UTF-8 with BOM in `source/`).
+- Use copies of databases for tests (trusted location), never your real databases.
diff --git a/README.md b/README.md
index 4982c60..12f7e1b 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,9 @@ Details: https://wiki.access-codelib.net/ACLib-Import-Wizard
 
 #### Automation API
 The wizard can be used without UI, e.g. from scripts or AI agents.
+For AI agents (MCP clients like Claude Code) there is an MCP server for this API:
+[ACLibImportWizard-MCP](https://github.com/AccessCodeLib/ACLibImportWizard-MCP)
+
 `API` returns a JSON string:
 
 ```vba
@@ -50,3 +53,6 @@ Notes:
 * Compile the project after `Import` and check the result.
 * With [msaccess-vcs-mcp](https://github.com/joyfullservice/msaccess-vcs-mcp):
   `vcs_call_vba(database_path="<target>.accdb", function_name="<add-in path without .accda>.API", args=["Resolve", "text/String2.cls"])`
+
+#### Contributing
+See [CONTRIBUTING.md](CONTRIBUTING.md) for branches, releases and development.