diff --git a/binutils-2.23.2-aarch64-em.patch b/binutils-2.23.2-aarch64-em.patch
new file mode 100644
index 0000000..f4aae4c
--- /dev/null
+++ b/binutils-2.23.2-aarch64-em.patch
@@ -0,0 +1,47 @@
+*** ../binutils-2.23.2.orig/ld/emultempl/aarch64elf.em	2013-06-05 09:46:17.499278813 +0100
+--- ld/emultempl/aarch64elf.em	2013-06-05 09:54:36.981292659 +0100
+*************** gld${EMULATION_NAME}_after_allocation (v
+*** 264,270 ****
+  }
+  
+  static void
+! gld${EMULATION_NAME}_finish (void)
+  {
+    if (! link_info.relocatable)
+      {
+--- 264,270 ----
+  }
+  
+  static void
+! gld${EMULATION_NAME}_local_finish (void)
+  {
+    if (! link_info.relocatable)
+      {
+*************** gld${EMULATION_NAME}_finish (void)
+*** 276,282 ****
+  	}
+      }
+  
+!   finish_default ();
+  }
+  
+  /* This is a convenient point to tell BFD about target specific flags.
+--- 276,282 ----
+  	}
+      }
+  
+!   gld${EMULATION_NAME}_finish ();
+  }
+  
+  /* This is a convenient point to tell BFD about target specific flags.
+*************** LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
+*** 413,416 ****
+  LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
+  
+  # Call the extra arm-elf function
+! LDEMUL_FINISH=gld${EMULATION_NAME}_finish
+--- 413,416 ----
+  LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
+  
+  # Call the extra arm-elf function
+! LDEMUL_FINISH=gld${EMULATION_NAME}_local_finish
diff --git a/binutils.spec b/binutils.spec
index 2481641..5ea52fa 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -27,7 +27,7 @@ Name: %{?cross}binutils%{?_with_debug:-debug}
 # official binutils release happens (2.24.0) we will be able to restore
 # Version to an honest value and everything will be good again.
 Version: 2.23.88.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -68,6 +68,8 @@ Patch16: binutils-2.23.2-kernel-ld-r.patch
 Patch17: binutils-2.23.2-bfd-texinfo-fixes.patch
 # Add support for the alternate debug info files created by the DWZ program.
 Patch18: binutils-2.23.2-dwz-alt-debuginfo.patch
+# Correct bug introduced by patch 16
+Patch19: binutils-2.23.2-aarch64-em.patch
 
 Provides: bundled(libiberty)
 
@@ -187,6 +189,7 @@ using libelf instead of BFD.
 %patch16 -p0 -b .kernel-ld-r~
 %patch17 -p0 -b .bfd-texinfo~
 %patch18 -p0 -b .dwz~
+%patch19 -p0 -b .aarch64~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -236,7 +239,7 @@ case %{binutils_target} in ppc*|ppc64*)
 esac
 
 %if 0%{?_with_debug:1}
-CFLAGS="$CFLAGS -O0 -ggdb2"
+CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0"
 %define enable_shared 0
 %endif
 
@@ -486,6 +489,10 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Wed Jun 05 2013 Nick Clifton <nickc@redhat.com> - 2.23.88.0.1-6
+- Fix building of aarch64 targets after applying the patch for kernel ld -r modules.
+- Fix building when "--with debug" is specified.
+
 * Wed May 29 2013 Nick Clifton <nickc@redhat.com> - 2.23.88.0.1-5
 - Add support for the alternative debuging files generated by the DWZ program.  (#965255)