diff --git a/srcpkgs/gdb/patches/runtime-warning.patch b/srcpkgs/gdb/patches/runtime-warning.patch
deleted file mode 100644
index d136e5704a..0000000000
--- a/srcpkgs/gdb/patches/runtime-warning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gdb/python/lib/gdb/command/prompt.py
-+++ b/gdb/python/lib/gdb/command/prompt.py
-@@ -45,7 +45,7 @@
-         self.hook_set = False
- 
-     def get_show_string (self, pvalue):
--        if self.value is not '':
-+        if self.value is not None and self.value != '':
-            return "The extended prompt is: " + self.value
-         else:
-            return "The extended prompt is not set."
-@@ -57,7 +57,7 @@
-         return ""
- 
-     def before_prompt_hook(self, current):
--        if self.value is not '':
-+        if self.value is not None and self.value != '':
-             return gdb.prompt.substitute_prompt(self.value)
-         else:
-             return None
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e4f275f355..883873b891 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
-version=8.3.1
-revision=3
+version=9.1
+revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb"
 configure_args="--disable-werror --disable-nls --with-system-readline
@@ -9,13 +9,14 @@ configure_args="--disable-werror --disable-nls --with-system-readline
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)"
 hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel $(vopt_if python 'python3-devel gettext-libs')"
+makedepends="ncurses-devel zlib-devel readline-devel expat-devel
+ $(vopt_if python 'python3-devel gettext-libs')"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4
+checksum=699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737
 patch_args="-Np1"
 
 if [ "${CROSS_BUILD}" ]; then
@@ -32,19 +33,23 @@ build_options_default="gdbserver python"
 vopt_conflict gdbserver static
 
 post_extract() {
-	sed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
-	# fixes aarch64-musl cross-build
-	sed -i -e "s/@REPLACE_STAT@/0/" gdb/gnulib/import/sys_stat.in.h
+	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
+	mkdir -p build
 }
-pre_configure() {
-	configure_args="${configure_args/with-sysroot/with-build-sysroot}"
-}
-pre_build() {
+do_configure() {
+	cd ${wrksrc}/build
+	../configure ${configure_args/with-sysroot/with-build-sysroot}
 	export gl_cv_func_gettimeofday_clobber=no
 	export gl_cv_func_working_strerror=yes
 	export gl_cv_func_strerror_0_works=yes
 }
-post_install() {
+do_build() {
+	cd ${wrksrc}/build
+	make ${makejobs} all
+}
+do_install() {
+	cd ${wrksrc}/build
+	make DESTDIR=${DESTDIR} ${makejobs} install
 	# resolve conflicts with binutils
 	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib
 	[ -d ${DESTDIR}/usr/lib64 ] && rm -rf ${DESTDIR}/usr/lib64