diff --git a/.gitea/workflows/sync-upstream.yml b/.gitea/workflows/sync-upstream.yml
new file mode 100644
index 0000000..08936bd
--- /dev/null
+++ b/.gitea/workflows/sync-upstream.yml
@@ -0,0 +1,30 @@
+name: Sync Upstream (12h)
+
+on:
+  schedule:
+    - cron: "0 */12 * * *"
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout fork
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Add upstream remote
+        run: |
+          git remote add upstream https://git.suckless.org/surf || true
+          git fetch upstream
+
+      - name: Merge upstream into master
+        run: |
+          git checkout master
+          git merge upstream/master --strategy-option ours --no-edit || true
+
+      - name: Push merged branch
+        run: |
+          git push origin master
+