diff --git a/net/duck/Portfile b/net/duck/Portfile
index 21107e8d40e5a..16a6396e548db 100644
--- a/net/duck/Portfile
+++ b/net/duck/Portfile
@@ -1,15 +1,17 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
+PortGroup           github 1.0
+PortGroup           java 1.0
 
 name                duck
-version             7.8.5.34493
-checksums           rmd160  696c1572aadf30e2f39514162a7bb1ab8a716282 \
-                    sha256  65ebfde2df81fce63e130ec988a81a7e81c1c76a7ca72426611f52e162abb3ad \
-                    size    108484092
+github.setup        iterate-ch cyberduck 9-2-5 release
+master_sites        https://github.com/iterate-ch/cyberduck/archive/refs/tags/release-${version}
+worksrcdir          cyberduck-release-${version}
+
+revision            0
 
 categories          net
-platforms           darwin
 
 license             GPL-2+
 maintainers         {ijackson @JacksonIsaac} openmaintainer
@@ -21,22 +23,30 @@ long_description    The universal file transfer tool 'duck' which runs \
     with FTP, SFTP or WebDAV plus support for cloud storage Amazon S3 & \
     OpenStack Swift deployments.
 
-homepage            https://duck.sh/
-master_sites        https://dist.duck.sh/
 
+checksums           rmd160  cb5c8a99d21d4140f4fd9f053428438923cb8879 \
+                    sha256  530746217e7212a709d2b586cf12507c1701ac6623c10470dc9bcb0b059f9f73 \
+                    size    32208819
+
+java.version        11+
+java.fallback       openjdk11
+
+depends_build       bin:mvn3:maven3
 use_configure       no
 
-build { }
+use_xcode           yes
+
+set maven_local_repository ${worksrcpath}/.m2/repository
+
+pre-build {
+    file mkdir ${maven_local_repository}
+    system -W ${worksrcpath}/cli/osx "mvn3 package -Dmaven.repo.local=${maven_local_repository} -DskipTests -Drevision=0 -DskipITs"
+
+}
 
-## Upstream binary seems to be built using libstdc++
-#  Port keeps failing on rev-upgrade since it
-#  checks if duck is built against libc++ or not.
-#  Note: Check and update this when port version updates.
-configure.cxx_stdlib \
-                    libstdc++
+build.cmd           xcodebuild
 
 destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/libexec/${name}
-    file copy ${workpath}/${name}.bundle ${destroot}${prefix}/libexec/${name}
-    ln -s ${prefix}/libexec/${name}/${name}.bundle/Contents/MacOS/duck ${destroot}${prefix}/bin/duck
+    copy -- ${worksrcpath}/osx/target/release/Cyberduck.app \
+    ${destroot}${applications_dir}
 }