diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
new file mode 100644
index 0000000..26efc20
--- /dev/null
+++ b/.github/workflows/javadoc.yml
@@ -0,0 +1,45 @@
+name: Generate and Publish Javadoc
+
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  checks: write
+  actions: read
+  contents: write
+
+jobs:
+  build:
+    # Only generate JavaDoc for the main repository
+    if: github.repository_owner == 'ohjelmointi2'
+
+    name: Javadoc
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout the repository
+      - uses: actions/checkout@v4
+
+      # Install Java 17. See https://github.com/education/autograding/issues/18
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Build and Generate Javadoc
+        run: ./gradlew javadoc
+
+      - name: Publish Javadoc
+        run: |
+          git config --local user.email "actions@github.com"
+          git config --local user.name "GitHub Actions"
+          mv build/docs/javadoc docs
+          git add docs
+          git commit -m "Publish Javadoc"
+          git push origin master:gh-pages --force
+
+      - name: Cleanup
+        run: |
+          rm -rf docs