diff --git a/srcpkgs/tuxpaint-config/template b/srcpkgs/tuxpaint-config/template
new file mode 100644
index 00000000000000..de70f0ffa33df3
--- /dev/null
+++ b/srcpkgs/tuxpaint-config/template
@@ -0,0 +1,33 @@
+# Template file for 'tuxpaint-config'
+pkgname=tuxpaint-config
+version=0.0.21
+revision=1
+build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
+make_install_args="PREFIX=/usr"
+hostmakedepends="pkg-config gettext"
+makedepends="fltk-devel libpaper-devel libunibreak-devel"
+depends="tuxpaint"
+short_desc="Configuration tool for Tux Paint"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="GPL-2.0-or-later"
+homepage="https://www.tuxpaint.org/"
+changelog="https://tuxpaint.org/docs/tuxpaint-config-CHANGES.txt"
+distfiles="${SOURCEFORGE_SITE}/tuxpaint/tuxpaint-config-${version}.tar.gz"
+checksum=5287de38944c302a7eaa069c8f5de635b95d82912e6cdf195c66366bf3431ae8
+
+post_install() {
+	# Install desktop file if not included
+	if [ ! -f "${DESTDIR}/usr/share/applications/tuxpaint-config.desktop" ]; then
+		vmkdir usr/share/applications
+		cat > "${DESTDIR}/usr/share/applications/tuxpaint-config.desktop" <<-EOF
+		[Desktop Entry]
+		Type=Application
+		Name=Tux Paint Config
+		Comment=Configure Tux Paint
+		Exec=tuxpaint-config
+		Icon=tuxpaint-config
+		Categories=Settings;
+		EOF
+	fi
+}
diff --git a/srcpkgs/tuxpaint-stamps/template b/srcpkgs/tuxpaint-stamps/template
index d108a52dede997..692a89429aaa68 100644
--- a/srcpkgs/tuxpaint-stamps/template
+++ b/srcpkgs/tuxpaint-stamps/template
@@ -1,6 +1,6 @@
 # Template file for 'tuxpaint-stamps'
 pkgname=tuxpaint-stamps
-version=2023.07.20
+version=2025.05.26
 revision=1
 build_style=gnu-makefile
 make_install_target="install-all"
@@ -8,8 +8,9 @@ short_desc="Stamps set for tuxpaint"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.tuxpaint.org/"
+changelog="https://tuxpaint.org/docs/tuxpaint-stamps-CHANGES.txt"
 distfiles="${SOURCEFORGE_SITE}/tuxpaint/tuxpaint-stamps/${version//./-}/tuxpaint-stamps-${version}.tar.gz"
-checksum=0fb420617451759a4ddcd8bfe255e85c2b6c24e453f93da11da2d41698037842
+checksum=09f4a29f8036c93a64c28134e3afaefb4b9d95a09a71e68fb7537f3c5f82949f
 
 pre_configure() {
 	vsed -i Makefile -e 's,DATA_PREFIX=,&$(DESTDIR),'
diff --git a/srcpkgs/tuxpaint/patches/0.9.31--cflags.patch b/srcpkgs/tuxpaint/patches/0.9.31--cflags.patch
deleted file mode 100644
index ec13b39bd36dba..00000000000000
--- a/srcpkgs/tuxpaint/patches/0.9.31--cflags.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9763b983f7490bbe85d05fc8fbdbe72827a94410 Mon Sep 17 00:00:00 2001
-From: Piotr Wójcik <chocimier@tlen.pl>
-Date: Sat, 16 Sep 2023 18:13:39 +0200
-Subject: cflags
-
-
-diff --git a/Makefile b/Makefile
-index 196c595..5da42bd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1252,7 +1252,7 @@ obj/tuxpaint.o:	src/tuxpaint.c \
- 		$(ARCH_HEADERS)
- 	@echo
- 	@echo "...Compiling Tux Paint from source..."
--	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) $(ARCH_DEFS) \
-+	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(FRIBIDI_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) $(ARCH_DEFS) \
- 		-c src/tuxpaint.c -o obj/tuxpaint.o
- 
- # Broke gperf|sed up into two steps so that it will fail properly if gperf is not installed; there's probably a more elegant solution -bjk 2009.11.20
-@@ -1299,14 +1299,14 @@ obj/fonts.o:	src/fonts.c src/fonts.h src/dirwalk.h src/progressbar.h \
- 		src/get_fname.h src/debug.h
- 	@echo
- 	@echo "...Compiling font support..."
--	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \
-+	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(SDL2_PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \
- 		-c src/fonts.c -o obj/fonts.o
- 
- obj/dirwalk.o:	src/dirwalk.c src/dirwalk.h src/progressbar.h src/fonts.h \
- 		src/debug.h
- 	@echo
- 	@echo "...Compiling directory-walking support..."
--	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \
-+	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(SDL2_PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \
- 		-c src/dirwalk.c -o obj/dirwalk.o
- 
- obj/cursor.o:	src/cursor.c src/cursor.h src/debug.h
--- 
-2.42.0
-
diff --git a/srcpkgs/tuxpaint/template b/srcpkgs/tuxpaint/template
index 2d828e82589b4a..041ac6e959d4a9 100644
--- a/srcpkgs/tuxpaint/template
+++ b/srcpkgs/tuxpaint/template
@@ -1,24 +1,27 @@
 # Template file for 'tuxpaint'
 pkgname=tuxpaint
-version=0.9.31
-revision=3
+version=0.9.35
+revision=1
 build_style=gnu-makefile
 conf_files="/etc/tuxpaint/tuxpaint.conf"
 hostmakedepends="gettext gperf pkg-config ImageMagick"
 makedepends="SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel
- SDL2_gfx-devel SDL2_Pango-devel
+ SDL2_gfx-devel SDL2_Pango-devel freetype-devel pango-devel
  cairo-devel fribidi-devel libimagequant-devel libpaper-devel librsvg-devel"
 short_desc="Free, award-winning drawing program for children ages 3 to 12"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.tuxpaint.org/"
+changelog="https://tuxpaint.org/docs/CHANGES.txt"
 distfiles="${SOURCEFORGE_SITE}/tuxpaint/${version}/tuxpaint-${version}.tar.gz"
-checksum=1a85c04fa5c9ae6b3ffd2ca8fa86a84c0c8b462b5059fa1fc2c445b5cfa857ee
+checksum=c1c18af91be77e94fdaab2c928204c4c39ba39ac5da2f441aaf2ecab6d8bd0ad
 replaces="tuxpaint-data>=0"
 CFLAGS="-D_GNU_SOURCE -D_POSIX_PRIORITY_SCHEDULING"
 
 pre_build() {
 	vsed -i Makefile -e s,/etc/bash_completion.d,/usr/share/bash-completion/completions,
+	# Add freetype2 and pango include paths
+	export CFLAGS+=" $(pkg-config --cflags freetype2 pango)"
 }
 
 post_install() {