diff --git a/depends/check-python.sh b/depends/check-python.sh
index c7ca7df0e..ce0a51821 100755
--- a/depends/check-python.sh
+++ b/depends/check-python.sh
@@ -9,4 +9,4 @@ pyprefix=$(python-config --prefix)
 [ $? -eq 0 ] || { echo "ERROR: Install python-dev before continuing."; exit 1; }
 
 ## Check for python header files
-( ls -1d "${pyprefix}"/include/python2.*/Python.h || ls -1d /opt/local/include/python2.*/Python.h ) 1>/dev/null 2>&1 || [ -f "$PYINSTALLDIR/include/Python.h" ] || { echo "ERROR: Install python-dev before continuing."; exit 1; }
+( ls -1d "${pyprefix}"/include/python[23].*/Python.h || ls -1d /opt/local/include/python[23].*/Python.h ) 1>/dev/null 2>&1 || [ -f "$PYINSTALLDIR/include/Python.h" ] || { echo "ERROR: Install python-dev before continuing."; exit 1; }
diff --git a/patches/gdb-7.5.1-PS3.patch b/patches/gdb-7.5.1-PS3.patch
deleted file mode 100644
index 2336f9566..000000000
--- a/patches/gdb-7.5.1-PS3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e90e9ad97190c3e187285682d905582503f4a42a Mon Sep 17 00:00:00 2001
-From: Tom Tromey <tromey@redhat.com>
-Date: Wed, 5 Dec 2012 14:56:18 +0000
-Subject: [PATCH] 	PR gdb/14917: 	* server.h (current_insn_ptr,
- emit_error): Declare 'extern'.
-
----
- gdb/gdbserver/ChangeLog | 5 +++++
- gdb/gdbserver/server.h  | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
-index e93ad00c1d1..929819e55bc 100644
---- a/gdb/gdbserver/server.h
-+++ b/gdb/gdbserver/server.h
-@@ -523,8 +523,8 @@ CORE_ADDR get_get_tsv_func_addr (void);
-    function in the IPA.  */
- CORE_ADDR get_set_tsv_func_addr (void);
- 
--CORE_ADDR current_insn_ptr;
--int emit_error;
-+extern CORE_ADDR current_insn_ptr;
-+extern int emit_error;
- 
- /* Version information, from version.c.  */
- extern const char version[];
diff --git a/scripts/003-gdb-PPU.sh b/scripts/003-gdb-PPU.sh
index ad4b17b1b..0fa8bbc9f 100755
--- a/scripts/003-gdb-PPU.sh
+++ b/scripts/003-gdb-PPU.sh
@@ -1,22 +1,19 @@
 #!/bin/sh -e
 # gdb-PPU.sh by Naomi Peori (naomi@peori.ca)
 
-GDB="gdb-7.5.1"
+GDB="gdb-11.2"
 
 if [ ! -d ${GDB} ]; then
 
   ## Download the source code.
-  if [ ! -f ${GDB}.tar.bz2 ]; then wget --continue https://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2; fi
+  if [ ! -f ${GDB}.tar.xz ]; then wget --continue https://ftp.gnu.org/gnu/gdb/${GDB}.tar.xz; fi
 
   ## Download an up-to-date config.guess and config.sub
   if [ ! -f config.guess ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
   if [ ! -f config.sub ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
 
   ## Unpack the source code.
-  tar xfvj ${GDB}.tar.bz2
-
-  ## Patch the source code.
-  cat ../patches/${GDB}-PS3.patch | patch -p1 -d ${GDB}
+  tar xfvJ ${GDB}.tar.xz
 
   ## Replace config.guess and config.sub
   cp config.guess config.sub ${GDB}
diff --git a/scripts/007-gdb-SPU.sh b/scripts/007-gdb-SPU.sh
index 73cd17d9c..b247bdf80 100755
--- a/scripts/007-gdb-SPU.sh
+++ b/scripts/007-gdb-SPU.sh
@@ -1,22 +1,19 @@
 #!/bin/sh -e
 # gdb-SPU.sh by Naomi Peori (naomi@peori.ca)
 
-GDB="gdb-7.5.1"
+GDB="gdb-11.2"
 
 if [ ! -d ${GDB} ]; then
 
   ## Download the source code.
-  if [ ! -f ${GDB}.tar.bz2 ]; then wget --continue https://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2; fi
+  if [ ! -f ${GDB}.tar.xz ]; then wget --continue https://ftp.gnu.org/gnu/gdb/${GDB}.tar.xz; fi
 
   ## Download an up-to-date config.guess and config.sub
   if [ ! -f config.guess ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
   if [ ! -f config.sub ]; then wget --continue https://git.savannah.gnu.org/cgit/config.git/plain/config.sub; fi
 
   ## Unpack the source code.
-  tar xfvj ${GDB}.tar.bz2
-
-  ## Patch the source code.
-  cat ../patches/${GDB}-PS3.patch | patch -p1 -d ${GDB}
+  tar xfvJ ${GDB}.tar.xz
 
   ## Replace config.guess and config.sub
   cp config.guess config.sub ${GDB}