diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..9f9e5e2c5
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,90 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "Release"
+on: [push, pull_request]
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read  
+      pull-requests: read
+    timeout-minutes: 130
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Set up JDK 11
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Apache Maven
+        run: mvn -f pom-first.xml -U clean install  && mvn clean install 
+      - name: Package releases
+        if: startsWith(github.ref, 'refs/tags/M')
+        run: |
+          set -xv
+          mkdir ${{ github.workspace }}/packages
+          export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-linux-x86_64.tar.gz
+          cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/linux/gtk/x86_64
+          ls -la
+          tar cvzf $PKGNAME ApacheDirectoryStudio
+          sha512sum $PKGNAME > $PKGNAME.sha512
+          export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-macos-aarch64.app.tar.gz
+          cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/aarch64
+          ls -la
+          tar cvzf $PKGNAME ApacheDirectoryStudio.app
+          sha512sum $PKGNAME > $PKGNAME.sha512
+          export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-macos-x86_64.app.tar.gz
+          cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64
+          ls -la
+          tar cvzf $PKGNAME ApacheDirectoryStudio.app
+          sha512sum $PKGNAME > $PKGNAME.sha512
+          export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-win32-x86_64.tar.gz
+          cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/win32/win32/x86_64
+          ls -la
+          tar cvzf $PKGNAME ApacheDirectoryStudio
+          sha512sum $PKGNAME > $PKGNAME.sha512
+      - name: Archive packages
+        if: startsWith(github.ref, 'refs/tags/M')
+        uses: actions/upload-artifact@v4
+        with:
+          name: packages
+          retention-days: 1
+          path: ${{ github.workspace }}/packages
+    env: 
+       MAVEN_OPTS: "-Xmx1024M"
+  release-to-github:
+    if: startsWith(github.ref, 'refs/tags/M')
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download packages
+        uses: actions/download-artifact@v4
+#        with:
+#          path: packages
+      - run: ls -R packages      
+      - name: Upload to Github Releases
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "packages/*.tar.gz*"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          draft: true
+          body: "Apache Directory Studio Releases for Linux, MacOS and Windows. Enhancements: support for MacOS ARM + fix TLS 1.3 bug"
+       
diff --git a/README.md b/README.md
index fcbc8c823..a964fea80 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,13 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License. -->
 
+# Fork: M17 release
+
+This is a fork of Apache Directory Studio 2.0.0-M17, with the following changes:
+- Fixed TLS 1.3 bug by updating dependency (@klasen).
+- Support for MacOS ARM (M1/M2) architecture (M17 only released MacOS Intel binaries).
+
+The new binaries can be found in the [releases section](https://github.com/nxadm/directory-studio/releases).
 
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/directory-studio/badge)](https://api.securityscorecards.dev/projects/github.com/apache/directory-studio)
 
diff --git a/pom.xml b/pom.xml
index 9f1ecb365..3aa436252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,8 +99,8 @@
     <org.apache.directory.api.version>2.1.0</org.apache.directory.api.version>
     <org.apache.directory.api.bundleversion>2.1.0</org.apache.directory.api.bundleversion>
     <org.apache.directory.server.version>2.0.0.AM26</org.apache.directory.server.version>
-    <org.apache.mina.version>2.1.3</org.apache.mina.version>
-    <org.apache.mina.bundleversion>2.1.3</org.apache.mina.bundleversion>
+    <org.apache.mina.version>2.1.10</org.apache.mina.version>
+    <org.apache.mina.bundleversion>2.1.10</org.apache.mina.bundleversion>
     <org.apache.poi.version>5.2.5</org.apache.poi.version>
     <org.apache.poi.bundleversion>5.2.5</org.apache.poi.bundleversion>
     <org.apache.xmlgraphics.fop.version>2.9</org.apache.xmlgraphics.fop.version>