--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,21 @@
+binutils (2.15-5multiarch3) multiarch; urgency=low
+
+  * Make sure to actually _apply_ the patch as well..
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 24 Feb 2005 15:46:08 +0100
+
+binutils (2.15-5multiarch2) multiarch; urgency=low
+
+  * Rebuild.
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 24 Feb 2005 14:35:58 +0100
+
+binutils (2.15-5multiarch1) multiarch; urgency=low
+
+  * Multiarch build
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 24 Feb 2005 14:14:03 +0100
+
 binutils (2.15-5) unstable; urgency=low
 
   * 121_ia64_unwind_fixes.dpatch: new patch from David Mosberger to fix


--- orig/debian/patches/00list
+++ mod/debian/patches/00list
@@ -15,3 +15,4 @@
 120_mips_xgot_multigot_workaround
 121_ia64_unwind_fixes
 122_m68k_undefweak_symbols
+124_multiarch

--- /dev/null
+++ mod/debian/patches/124_multiarch.dpatch
@@ -0,1 +1,41 @@
+#!/bin/sh -e
+## 000_print_debian_version.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Multiarch support
+## DP: Author: Tollef Fog Heen <tfheen@debian.org>
+## DP: Upstream status: Not submitted
+## DP: Date: 2005-01-26
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- binutils-2.14.90.0.6/ld/genscripts.sh.old	2003-08-21 16:28:47.000000000 +0100
++++ binutils-2.14.90.0.6/ld/genscripts.sh	2005-01-26 16:28:48.000000000 +0100
+@@ -188,7 +188,7 @@
+   esac
+ fi
+ 
+-LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'`
++LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\"); SEARCH_DIR(\\"\1\\/'${TOOL_LIB}'");/g'`
+ 
+ # We need it for testsuite.
+ case " $EMULATION_LIBPATH " in
+