diff --git a/srcpkgs/gambit/patches/tests.patch b/srcpkgs/gambit/patches/tests.patch
new file mode 100644
index 00000000000..c74b293240b
--- /dev/null
+++ b/srcpkgs/gambit/patches/tests.patch
@@ -0,0 +1,14 @@
+Some unit-tests expect an installed version of Gambit, redirect to the
+local source.
+
+--- a/tests/run-unit-tests.scm
++++ b/tests/run-unit-tests.scm
+@@ -184,7 +184,7 @@
+ 
+       (case target
+         ((C)
+-         (run "../gsi/gsi" "-:debug-settings=-,io-settings=lu,~~=.." "-f" file))
++         (run "../gsi/gsi" "-:debug-settings=-,io-settings=lu,~~=..,~~lib=../lib" "-f" file))
+         (else
+          (let ((gsi (string-append "../gsi/gsi-" (symbol->string target))))
+            (run gsi "-f" file))))))
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 27fbcbf793e..bade05650ae 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,6 +1,6 @@
 # Template file for 'gambit'
 pkgname=gambit
-version=4.9.4
+version=4.9.5
 revision=1
 build_style=gnu-configure
 # We only build core, since the rest doesn't cross-compile.
@@ -16,18 +16,20 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"
 homepage="https://gambitscheme.org/"
 distfiles="https://github.com/gambit/gambit/archive/v${version}.tar.gz"
-checksum=19fb44a65b669234f6c0467cdc3dbe2e2c95a442f38e4638e7d89c90e247bd08
+checksum=758da7b4afe6411e9c4fed14b0cc5ada39b5f1393c1edd4d3dd9c9a06127c310
+alternatives="
+ scheme:scheme:/usr/bin/gsi
+ scheme:scheme.1:/usr/share/man/man1/gsi.1
+ scheme:scheme-r5rs:/usr/bin/gsi
+"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-DNETDB_INTERNAL=-1 -DNETDB_SUCCESS=0";;
 esac
 
-post_patch() {
-	vsed -i 's/4\.9\.3/4.9.4/g' include/stamp-release.h
-}
-
 post_install() {
 	for f in ${DESTDIR}/usr/lib/gambit/lib*.so.*; do
 		ln -sfr $f ${DESTDIR}/usr/lib
 	done
+	rm ${DESTDIR}/usr/bin/scheme-r5rs
 }