diff --git a/x11-libs/fltk/fltk-1.3~git.recipe b/x11-libs/fltk/fltk-1.3.8.recipe
similarity index 80%
rename from x11-libs/fltk/fltk-1.3~git.recipe
rename to x11-libs/fltk/fltk-1.3.8.recipe
index d3da73676..24bf825d6 100644
--- a/x11-libs/fltk/fltk-1.3~git.recipe
+++ b/x11-libs/fltk/fltk-1.3.8.recipe
@@ -10,17 +10,16 @@ but works fine as a shared library. \
 FLTK also includes an excellent UI builder called FLUID that can be used \
 to create applications in minutes."
 HOMEPAGE="https://www.fltk.org/"
-COPYRIGHT="1998-2019 by Bill Spitzak and others."
+COPYRIGHT="1998-2021 by Bill Spitzak and others."
 LICENSE="FLTK
 	GNU LGPL v2"
-REVISION="4"
-SOURCE_URI="https://github.com/mmuman/fltk/archive/haiku-1.3-final.tar.gz"
-CHECKSUM_SHA256="5ea5eb6f4028534bb911a61ad3df7dbfa1274dd200a03be441b75b691f79d7f1"
-SOURCE_DIR="fltk-haiku-1.3-final"
+REVISION="1"
+SOURCE_URI="https://www.fltk.org/pub/fltk/$portVersion/fltk-$portVersion-source.tar.bz2"
+CHECKSUM_SHA256="1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d"
 PATCHES="fltk-$portVersion.patchset"
 
-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
@@ -43,6 +42,8 @@ REQUIRES="
 	#lib:libglu$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
+	lib:libXext$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -51,8 +52,8 @@ PROVIDES_devel="
 	devel:libfltk$secondaryArchSuffix = $libVersion
 	devel:libfltk_forms$secondaryArchSuffix = $libVersion
 	devel:libfltk_images$secondaryArchSuffix = $libVersion
-	cmd:fltk_config$commandSuffix = 1.3.5
-	cmd:fluid$commandSuffix = 1.3.5
+	cmd:fltk_config$commandSuffix = $portVersion
+	cmd:fluid$commandSuffix = $portVersion
 	"
 REQUIRES_devel="
 	fltk$secondaryArchSuffix == $portVersion base
@@ -61,7 +62,10 @@ REQUIRES_devel="
 	#lib:libglu$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
+	lib:libXext$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
 	#devel:libgl$secondaryArchSuffix
 	"
 
@@ -71,6 +75,7 @@ BUILD_REQUIRES="
 	#devel:libglu$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -101,11 +106,14 @@ BUILD()
 		--docdir=$developDocDir \
 		--enable-shared \
 		--disable-gl \
+		--disable-xft \
 		--disable-localjpeg \
 		--disable-localpng \
 		--disable-localzlib \
 		--enable-debug
 	make $jobArgs
+	cd documentation && make html
+
 }
 
 INSTALL()
@@ -115,6 +123,9 @@ INSTALL()
 	# remove static libraries
 	rm $libDir/*.a
 
+	# we are not unix
+	rm -rf $dataDir/{applications,icons,mime}
+
 	prepareInstalledDevelLibs \
 		libfltk libfltk_forms libfltk_images
 	fixPkgconfig
@@ -124,13 +135,14 @@ INSTALL()
 
 	addAppDeskbarSymlink $commandBinDir/fluid "FLUID"
 
-	# extract the FLTK license, we already have the GPLv2 text
-	# XXX: haikuporter does not like it, wants the licence beforehand anyway.
-	#sed -n '/^------/q;p' < COPYING > $dataDir/licenses/FLTK
-
 	packageEntries devel \
 		$developDir \
 		$commandBinDir \
 		$manDir \
-		${dataDir}/deskbar
+		$dataDir/{deskbar,doc}
+}
+
+TEST()
+{
+	ctest --test-dir build --output-on-failure
 }
diff --git a/x11-libs/fltk/patches/fltk-1.3.8.patchset b/x11-libs/fltk/patches/fltk-1.3.8.patchset
new file mode 100644
index 000000000..8d0cf142d
--- /dev/null
+++ b/x11-libs/fltk/patches/fltk-1.3.8.patchset
@@ -0,0 +1,32 @@
+From 0acb6ec2f0b48182ed835d19056e0ada65b92d34 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Thu, 11 May 2023 10:28:34 +0200
+Subject: Fix crash, kudos to waddlesplash
+
+
+diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
+index c75ff47..61e0d07 100644
+--- a/src/Fl_Pixmap.cxx
++++ b/src/Fl_Pixmap.cxx
+@@ -206,6 +206,7 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int H
+     // make X use the bitmap as a mask:
+     XSetClipMask(fl_display, fl_gc, pxm->mask_);
+     XSetClipOrigin(fl_display, fl_gc, X-cx, Y-cy);
++#ifndef __HAIKU__
+     if (clip_region()) {
+       // At this point, XYWH is the bounding box of the intersection between
+       // the current clip region and the (portion of the) pixmap we have to draw.
+@@ -227,7 +228,9 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int H
+         copy_offscreen(X1, Y1, W1, H1, pxm->id_, cx + (X1 - X), cy + (Y1 - Y));
+       }
+       XDestroyRegion(r);
+-    } else {
++    } else
++#endif
++	{
+       copy_offscreen(X, Y, W, H, pxm->id_, cx, cy);
+     }
+     // put the old clip region back
+-- 
+2.37.3
+
diff --git a/x11-libs/fltk/patches/fltk-1.3~git.patchset b/x11-libs/fltk/patches/fltk-1.3~git.patchset
deleted file mode 100644
index 4085a767c..000000000
--- a/x11-libs/fltk/patches/fltk-1.3~git.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From e569233fe948ab284478dc67c9f1f829d0b6fae5 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Fri, 8 Mar 2019 12:11:37 +0100
-Subject: Fix install path for the examples
-
-
-diff --git a/makeinclude.in b/makeinclude.in
-index f013ddd..ca0f583 100644
---- a/makeinclude.in
-+++ b/makeinclude.in
-@@ -37,7 +37,7 @@ includedir	= @includedir@
- libdir		= @libdir@
- mandir		= @mandir@
- srcdir		= @srcdir@
--docdir		= $(datadir)/doc/fltk
-+docdir		= @docdir@
- VPATH		= @srcdir@
- USEMMFILES	= @USEMMFILES@
- 
--- 
-2.19.1
-