diff --git a/patches/gdb-line-addr-fix.patch b/patches/gdb-line-addr-fix.patch
deleted file mode 100644
index fcb2192..0000000
--- a/patches/gdb-line-addr-fix.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git demoscene.orig/submodules/binutils-gdb/gdb/dbxread.c demoscene/submodules/binutils-gdb/gdb/dbxread.c
-index 2df9f5c4d0..c33472bdab 100644
---- demoscene.orig/submodules/binutils-gdb/gdb/dbxread.c
-+++ demoscene/submodules/binutils-gdb/gdb/dbxread.c
-@@ -2544,7 +2544,11 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name,
-       if (*name == '\000')
- 	break;
- 
-+#if (DEFAULT_BFD_VEC == amiga_vec)
-+      function_start_offset = section_offsets[SECT_OFF_TEXT (objfile)];
-+#else
-       function_start_offset = 0;
-+#endif
- 
-       start_stabs ();
-       start_symtab (objfile, name, NULL, valu, language);
-@@ -2755,7 +2759,9 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name,
- 		}
- 
- 	      /* These addresses are absolute.  */
-+#if (DEFAULT_BFD_VEC != amiga_vec)
- 	      function_start_offset = valu;
-+#endif
- 
- 	      within_function = 1;
- 
-diff --git demoscene.orig/submodules/binutils-gdb/gdb/remote.c demoscene/submodules/binutils-gdb/gdb/remote.c
-index 2c31613575..fac21765da 100644
---- demoscene.orig/submodules/binutils-gdb/gdb/remote.c
-+++ demoscene/submodules/binutils-gdb/gdb/remote.c
-@@ -4095,11 +4095,6 @@ remote_target::~remote_target ()
-   delete rs->notif_state;
- }
- 
--/* Query the remote side for the text, data and bss offsets.  */
--#if (DEFAULT_BFD_VEC == amiga_vec)
--CORE_ADDR text_offset;
--#endif
--
- void
- remote_target::get_offsets ()
- {
-@@ -4249,9 +4244,6 @@ remote_target::get_offsets ()
-       if (SECT_OFF_BSS (symfile_objfile) != SECT_OFF_TEXT (symfile_objfile))
- 	offs[SECT_OFF_BSS (symfile_objfile)] = bss_addr ? bss_addr : data_addr;
-     }
--#if (DEFAULT_BFD_VEC == amiga_vec)
--  text_offset = offs[SECT_OFF_TEXT (symfile_objfile)];
--#endif
-   objfile_relocate (symfile_objfile, offs);
- }
- 
-diff --git demoscene.orig/submodules/binutils-gdb/gdb/symfile.c demoscene/submodules/binutils-gdb/gdb/symfile.c
-index 141e470998..a77f8af471 100644
---- demoscene.orig/submodules/binutils-gdb/gdb/symfile.c
-+++ demoscene/submodules/binutils-gdb/gdb/symfile.c
-@@ -2857,32 +2857,11 @@ allocate_compunit_symtab (struct objfile *objfile, const char *name)
-   return cu;
- }
- 
--/* Hook CU to the objfile it comes from.  */
--#if (DEFAULT_BFD_VEC == amiga_vec)
--extern CORE_ADDR text_offset;
--#endif
--
- void
- add_compunit_symtab_to_objfile (struct compunit_symtab *cu)
- {
-   cu->next = cu->objfile->compunit_symtabs;
-   cu->objfile->compunit_symtabs = cu;
--#if (DEFAULT_BFD_VEC == amiga_vec)
--  if (text_offset)
--    {
--      struct symtab *s;
--      struct linetable *l;
--      int i;
--
--      for ((s) = (cu) -> filetabs; (s) != NULL; (s) = (s) -> next)
--      {
--	l = SYMTAB_LINETABLE (s);
--	if (l)
--	for (i = 0; i < l->nitems; ++i)
--		    l->item[i].pc += text_offset;
--      }
--    }
--#endif
- }
- 
- 
diff --git a/patches/gdb-symbol-addr-fix.patch b/patches/gdb-symbol-addr-fix.patch
deleted file mode 100644
index 6913bb3..0000000
--- a/patches/gdb-symbol-addr-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- demoscene-toolchain.orig/submodules/binutils-gdb/gdb/amigaread.c
-+++ demoscene-toolchain/submodules/binutils-gdb/gdb/amigaread.c
-@@ -374,7 +374,7 @@ amiga_symtab_read (minimal_symbol_reader &reader,
- 	     symbols in their own section, so all symbols we are
- 	     interested in will have a section.  */
- 	  /* Bfd symbols are section relative.  */
--	  symaddr = sym->value + sym->section->vma;
-+	  symaddr = sym->value;
- 	  /* For non-absolute symbols, use the type of the section
- 	     they are relative to, to intuit text/data.  Bfd provides
- 	     no way of figuring this out for absolute symbols.  */
diff --git a/patches/series b/patches/series
index a319623..f8a5759 100644
--- a/patches/series
+++ b/patches/series
@@ -1,7 +1,5 @@
 gcc-2.95.3-amigahunk-fix.patch
 gcc-2.95.3-bss-section.patch
-gdb-line-addr-fix.patch
-gdb-symbol-addr-fix.patch
 fs-uae/break-on-illegal.diff
 fs-uae/break-on-sigint.diff
 fs-uae/break-at-start.diff
diff --git a/submodules/binutils-gdb b/submodules/binutils-gdb
index d83c0e0..033085a 160000
--- a/submodules/binutils-gdb
+++ b/submodules/binutils-gdb
@@ -1 +1 @@
-Subproject commit d83c0e0bfb66d67ff2c50f16e9c8a98f1bc20908
+Subproject commit 033085a1380353822c19adc1d9c9dadb82ba42e1
diff --git a/submodules/fs-uae b/submodules/fs-uae
index 7e538a1..f5bf027 160000
--- a/submodules/fs-uae
+++ b/submodules/fs-uae
@@ -1 +1 @@
-Subproject commit 7e538a18f7ad8f9ead0ea2864ca022ac15cd4f15
+Subproject commit f5bf0271008d6c16eb255475345ee9af1ef3ce7c