diff --git a/srcpkgs/freeplane/patches/fix-gradle8-compat.patch b/srcpkgs/freeplane/patches/fix-gradle8-compat.patch
new file mode 100644
index 00000000000000..f2865c1bdbf750
--- /dev/null
+++ b/srcpkgs/freeplane/patches/fix-gradle8-compat.patch
@@ -0,0 +1,24 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -171,11 +171,6 @@
+        delete "$buildDir/libs"
+    }
+    
+-   // Gradle 9.0 is stricter about test discovery - many subprojects have non-JUnit test files
+-   test {
+-       failOnNoDiscoveredTests = false
+-   }
+-   
+    jar.dependsOn cleanBUILD
+ }
+ 
+--- a/freeplane_framework/build.gradle
++++ b/freeplane_framework/build.gradle
+@@ -12,7 +12,6 @@
+ 
+ test {
+ 	// TestApp is not a JUnit test, just a debugging app
+-	failOnNoDiscoveredTests = false
+ }
+ 
+ task freeplanelauncherJar(type: Jar) {
diff --git a/srcpkgs/freeplane/patches/jdk11-default.patch b/srcpkgs/freeplane/patches/jdk11-default.patch
deleted file mode 100644
index 2f27d35af84a8c..00000000000000
--- a/srcpkgs/freeplane/patches/jdk11-default.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-freeplane does not work with jdk17, so set jdk11 as the default.
-This can be overridden by the upstream-created method still.
-
---- a/freeplane_framework/script/freeplane.sh
-+++ b/freeplane_framework/script/freeplane.sh
-@@ -5,6 +5,9 @@
- 	set -x
- fi
- 
-+# set openjdk11 as the default, regardless of xbps-alternatives
-+[ -z "$FREEPLANE_JAVA_HOME" ] && FREEPLANE_JAVA_HOME=/usr/lib/jvm/openjdk11
-+
- ########## FUNCTIONS DEFINITIONS #######################################
- 
- _debug() {
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index e98b19dc01e6af..30ef021ebccb8e 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,15 +1,17 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.14
+version=1.13.2
 revision=1
-hostmakedepends="apache-ant openjdk11 unzip gradle"
-depends="openjdk11-jre"
+hostmakedepends="apache-ant openjdk17 gradle"
+depends="openjdk17-jre"
+checkdepends="fontconfig liberation-fonts-ttf"
 short_desc="Application for Mind Mapping, Knowledge Management, Project Management"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
-distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz"
-checksum=8c463c997675b0e351724673e9ca6357f4ef47bd9df0c49b73645090fb19cd7f
+distfiles="https://github.com/freeplane/freeplane/archive/refs/tags/release-${version}.tar.gz"
+checksum=8d7807ad1c06463746df395575d343b58bd1a76de851ca060405ef17284d8b2e
+noverifyrdeps=yes
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
@@ -27,14 +29,31 @@ do_build() {
 	gradle format_translation binZip -x test
 }
 
+do_check() {
+	. /etc/profile.d/apache-ant.sh
+	. /etc/profile.d/jdk.sh
+
+	export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
+	gradle test
+}
+
 do_install() {
-	unzip DIST/freeplane_bin-$version.zip -d install
-	find install -type f -name \*.exe -delete
-	vmkdir usr/share/$pkgname
-	mv install/$pkgname-$version/* $DESTDIR/usr/share/$pkgname
+	case "$XBPS_MACHINE" in
+		x86_64*) vinstall BIN/libflatlaf-linux-x86_64.so 644 usr/lib ;;
+		aarch64*) vinstall BIN/libflatlaf-linux-arm64.so 644 usr/lib ;;
+	esac
 	vmkdir usr/bin
-	ln -s /usr/share/freeplane/freeplane.sh $DESTDIR/usr/bin/$pkgname
 	vmkdir usr/share/pixmaps
+	vmkdir usr/share/freeplane
+	vinstall BIN/freeplane.sh 755 usr/share/freeplane
+	vinstall BIN/freeplane.svg 644 usr/share/freeplane
+	for _f in BIN/*.jar BIN/*.xargs BIN/*.policy; do
+		vinstall "$_f" 644 usr/share/freeplane
+	done
+	for _dir in BIN/*/; do
+		vcopy "$_dir" usr/share/freeplane/
+	done
+	ln -s /usr/share/freeplane/freeplane.sh $DESTDIR/usr/bin/freeplane
 	ln -s /usr/share/freeplane/freeplane.svg $DESTDIR/usr/share/pixmaps/freeplane.svg
 	vinstall $FILESDIR/freeplane.desktop 644 usr/share/applications
 }