diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index 3937ec5af..aa3049f6e 100644
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/
 TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_VERSION=8.3.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=9.1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4
+TERMUX_PKG_SHA256=699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737
 TERMUX_PKG_DEPENDS="libc++, liblzma, libexpat, readline, ncurses, libmpfr, python, zlib"
 TERMUX_PKG_BREAKS="gdb-dev"
 TERMUX_PKG_REPLACES="gdb-dev"
diff --git a/packages/gdb/gdb-common-job-control.c.patch b/packages/gdb/gdb-common-job-control.c.patch
deleted file mode 100644
index 30a712ab4..000000000
--- a/packages/gdb/gdb-common-job-control.c.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -u -r ../gdb-8.1/gdb/common/job-control.c ./gdb/common/job-control.c
---- ../gdb-8.1/gdb/common/job-control.c	2018-01-05 05:07:23.000000000 +0100
-+++ ./gdb/common/job-control.c	2018-02-01 21:19:44.732858138 +0100
-@@ -45,10 +45,7 @@
-   if (job_control)
-     {
- #ifdef HAVE_SETPGID
--      /* The call setpgid (0, 0) is supposed to work and mean the same
--         thing as this, but on Ultrix 4.2A it fails with EPERM (and
--         setpgid (getpid (), getpid ()) succeeds).  */
--      retval = setpgid (getpid (), getpid ());
-+      retval = setpgid (0, 0);
- #else
- #ifdef HAVE_SETPGRP
- #ifdef SETPGRP_VOID
diff --git a/packages/gdb/gdb-common-pathstuff.c.patch b/packages/gdb/gdb-common-pathstuff.c.patch
deleted file mode 100644
index a14bdff63..000000000
--- a/packages/gdb/gdb-common-pathstuff.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r ../gdb-8.3/gdb/common/pathstuff.c ./gdb/common/pathstuff.c
---- ../gdb-8.3/gdb/common/pathstuff.c	2019-02-27 04:51:50.000000000 +0000
-+++ ./gdb/common/pathstuff.c	2019-05-11 22:45:37.765420769 +0000
-@@ -262,7 +262,7 @@
-   if (tmp != nullptr)
-     return tmp;
- 
--  return "/tmp";
-+  return "@TERMUX_PREFIX@/tmp";
- #endif
- }
- 
-@@ -273,7 +273,7 @@
- {
-   const char *ret = getenv ("SHELL");
-   if (ret == NULL)
--    ret = "/bin/sh";
-+    ret = "@TERMUX_PREFIX@/bin/bash";
- 
-   return ret;
- }
diff --git a/packages/gdb/gdb-common-signals-state-save-restore.c.patch b/packages/gdb/gdb-common-signals-state-save-restore.c.patch
deleted file mode 100644
index f6f12044e..000000000
--- a/packages/gdb/gdb-common-signals-state-save-restore.c.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r ../gdb-8.1/gdb/common/signals-state-save-restore.c ./gdb/common/signals-state-save-restore.c
---- ../gdb-8.1/gdb/common/signals-state-save-restore.c	2018-01-31 03:58:50.000000000 +0100
-+++ ./gdb/common/signals-state-save-restore.c	2018-02-01 21:38:47.791540495 +0100
-@@ -69,6 +69,7 @@
- 	  && oldact->sa_handler != SIG_DFL
- 	  && oldact->sa_handler != SIG_IGN)
- 	{
-+#ifndef __ANDROID__
- 	  found_preinstalled = true;
- 
- 	  /* Use raw fprintf here because we're being called in early
-@@ -78,6 +79,7 @@
- 		   _("warning: Found custom handler for signal "
- 		     "%d (%s) preinstalled.\n"), i,
- 		   strsignal (i));
-+#endif
- 	}
-     }
- 
diff --git a/packages/gdb/gdb-gdbsupport-job-control.c.patch b/packages/gdb/gdb-gdbsupport-job-control.c.patch
new file mode 100644
index 000000000..e20deb65d
--- /dev/null
+++ b/packages/gdb/gdb-gdbsupport-job-control.c.patch
@@ -0,0 +1,11 @@
+--- ../gdb-9.1/gdb/gdbsupport/job-control.c	2020-02-08 12:50:14.000000000 +0000
++++ ./gdb/gdbsupport/job-control.c	2020-02-15 22:34:50.417235000 +0000
+@@ -48,7 +48,7 @@
+       /* The call setpgid (0, 0) is supposed to work and mean the same
+          thing as this, but on Ultrix 4.2A it fails with EPERM (and
+          setpgid (getpid (), getpid ()) succeeds).  */
+-      retval = setpgid (getpid (), getpid ());
++      retval = setpgid (0, 0);
+ #else
+ #ifdef HAVE_SETPGRP
+ #ifdef SETPGRP_VOID
diff --git a/packages/gdb/gdb-gdbsupport-pathstuff.c.patch b/packages/gdb/gdb-gdbsupport-pathstuff.c.patch
new file mode 100644
index 000000000..e1850a5a4
--- /dev/null
+++ b/packages/gdb/gdb-gdbsupport-pathstuff.c.patch
@@ -0,0 +1,21 @@
+diff -u -r ../gdb-9.1/gdb/gdbsupport/pathstuff.c ./gdb/gdbsupport/pathstuff.c
+--- ../gdb-9.1/gdb/gdbsupport/pathstuff.c	2020-02-08 12:50:14.000000000 +0000
++++ ./gdb/gdbsupport/pathstuff.c	2020-02-15 22:37:01.888578000 +0000
+@@ -262,7 +262,7 @@
+   if (tmp != nullptr)
+     return tmp;
+ 
+-  return "/tmp";
++  return "@TERMUX_PREFIX@/tmp";
+ #endif
+ }
+ 
+@@ -273,7 +273,7 @@
+ {
+   const char *ret = getenv ("SHELL");
+   if (ret == NULL)
+-    ret = "/bin/sh";
++    ret = "@TERMUX_PREFIX@/bin/sh";
+ 
+   return ret;
+ }
diff --git a/packages/gdb/gdb-gdbsupport-signals-state-save-restore.c.patch b/packages/gdb/gdb-gdbsupport-signals-state-save-restore.c.patch
new file mode 100644
index 000000000..c2b5a54be
--- /dev/null
+++ b/packages/gdb/gdb-gdbsupport-signals-state-save-restore.c.patch
@@ -0,0 +1,19 @@
+diff -u -r ../gdb-9.1/gdb/gdbsupport/signals-state-save-restore.c ./gdb/gdbsupport/signals-state-save-restore.c
+--- ../gdb-9.1/gdb/gdbsupport/signals-state-save-restore.c	2020-02-08 12:50:14.000000000 +0000
++++ ./gdb/gdbsupport/signals-state-save-restore.c	2020-02-15 22:47:13.367387000 +0000
+@@ -42,6 +42,7 @@
+   if (res == -1)
+     perror_with_name (("sigprocmask"));
+ 
++#ifndef __ANDROID__
+   bool found_preinstalled = false;
+ 
+   for (i = 1; i < NSIG; i++)
+@@ -84,6 +85,7 @@
+ won't be propagated to spawned programs.\n"));
+     }
+ #endif
++#endif
+ }
+ 
+ /* See signals-state-save-restore.h.   */
diff --git a/packages/gdb/gdb-gnulib-import-string.in.h.patch b/packages/gdb/gdb-gnulib-import-string.in.h.patch
deleted file mode 100644
index c86e8ea79..000000000
--- a/packages/gdb/gdb-gnulib-import-string.in.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -u -r ../gdb-8.1/gdb/gnulib/import/string.in.h ./gdb/gnulib/import/string.in.h
---- ../gdb-8.1/gdb/gnulib/import/string.in.h	2017-06-04 17:51:26.000000000 +0200
-+++ ./gdb/gnulib/import/string.in.h	2018-02-01 22:09:38.398023253 +0100
-@@ -183,9 +183,8 @@
- #if @GNULIB_MEMPCPY@
- # if ! @HAVE_MEMPCPY@
- _GL_FUNCDECL_SYS (mempcpy, void *,
--                  (void *restrict __dest, void const *restrict __src,
--                   size_t __n)
--                  _GL_ARG_NONNULL ((1, 2)));
-+                  (void * __dest, void const * __src,
-+                   size_t __n));
- # endif
- _GL_CXXALIAS_SYS (mempcpy, void *,
-                   (void *restrict __dest, void const *restrict __src,
diff --git a/packages/gdb/readline.patch b/packages/gdb/readline.patch
deleted file mode 100644
index 81d2786a5..000000000
--- a/packages/gdb/readline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../gdb-7.6.2/readline/complete.c ./readline/complete.c
---- ../gdb-7.6.2/readline/complete.c	2013-12-08 05:11:52.000000000 +0100
-+++ ./readline/complete.c	2014-01-07 16:43:59.170309785 +0100
-@@ -2026,7 +2026,7 @@
-      const char *text;
-      int state;
- {
--#if defined (__WIN32__) || defined (__OPENNT)
-+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__)
-   return (char *)NULL;
- #else /* !__WIN32__ && !__OPENNT) */
-   static char *username = (char *)NULL;