diff -Nru kernel-wedge-2.87ubuntu1/commands/copy-firmware kernel-wedge-2.90ubuntu2/commands/copy-firmware
--- kernel-wedge-2.87ubuntu1/commands/copy-firmware	2013-07-30 12:32:29.000000000 +0000
+++ kernel-wedge-2.90ubuntu2/commands/copy-firmware	2015-07-31 15:38:26.000000000 +0000
@@ -85,7 +85,7 @@
 code=0
 # loop over all udebs
 for i in $(
-	find $fwlistdir -maxdepth 1 \( -type f -or -type l \) -not -name '*.lnk' -printf "%f\t%f\n"
+	find $fwlistdir/ -maxdepth 1 \( -type f -or -type l \) -not -name '*.lnk' -printf "%f\t%f\n"
 ); do
 	# preprocess file, handle includes and excludes and sort so that
 	# the joins work, no matter what the order of the input.
diff -Nru kernel-wedge-2.87ubuntu1/commands/copy-modules kernel-wedge-2.90ubuntu2/commands/copy-modules
--- kernel-wedge-2.87ubuntu1/commands/copy-modules	2013-07-30 12:32:29.000000000 +0000
+++ kernel-wedge-2.90ubuntu2/commands/copy-modules	2016-03-20 13:36:49.000000000 +0000
@@ -66,7 +66,7 @@
 			# Prefer modules in the kernel subdir, but failing
 			# that search the whole thing, to find third-party,
 			# etc modules.
-			match="$(find `ls -d $moddir/kernel 2>/dev/null` $moddir \
+			match="$(find `ls -d $moddir/kernel 2>/dev/null` $moddir/ \
 			            -name $module.o -or -name $module.ko \
 				| head -n 1 | sed "s!$moddir/!!")"
 			
@@ -163,7 +163,7 @@
 # loop over all udebs, sort that all dependent modules are processed first
 for i in $(
 	{
-		find $modlistdir -maxdepth 1 \( -type f -or -type l \) -not -name '*.lnk' -printf "%f\t%f\n"
+		find $modlistdir/ -maxdepth 1 \( -type f -or -type l \) -not -name '*.lnk' -printf "%f\t%f\n"
 		cat $tmpdir/module-deps.packages
 	} | tsort | tac
 ); do
diff -Nru kernel-wedge-2.87ubuntu1/commands/install-files kernel-wedge-2.90ubuntu2/commands/install-files
--- kernel-wedge-2.87ubuntu1/commands/install-files	2013-07-30 12:32:29.000000000 +0000
+++ kernel-wedge-2.90ubuntu2/commands/install-files	2016-03-20 13:35:26.000000000 +0000
@@ -54,10 +54,10 @@
 			$sourcedir = "";
 		}
 		elsif ($arch =~ /^kfreebsd-/) {
-			$sourcedir = "debian/kfreebsd-image-$installedname";
+			$sourcedir = "debian/kfreebsd-image-$kernelversion-$flavour";
 		}
 		else {
-			$sourcedir = "debian/linux-image-$installedname";
+			$sourcedir = "debian/linux-image-$kernelversion-$flavour";
 		}
 		# Set SOURCEDIR for copy-modules
 		$ENV{SOURCEDIR} = $sourcedir;
diff -Nru kernel-wedge-2.87ubuntu1/debian/changelog kernel-wedge-2.90ubuntu2/debian/changelog
--- kernel-wedge-2.87ubuntu1/debian/changelog	2013-07-30 12:32:56.000000000 +0000
+++ kernel-wedge-2.90ubuntu2/debian/changelog	2016-03-20 13:41:04.000000000 +0000
@@ -1,3 +1,57 @@
+kernel-wedge (2.90ubuntu2) trusty; urgency=medium
+
+  * Backport to trusty
+  * Fix install-files to use -$kernelversion-$flavour in $sourcedir,
+    rather than -$installname
+
+ -- Peter Hunt <tigerite@gmail.com>  Sun, 20 Mar 2016 13:40:48 +0000
+
+kernel-wedge (2.90ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Firmware udeb handling (copy-firmware and related changes).
+    - gen-control: Emit debian/control.stub if it exists regardless of
+      whether there are any architecture-specific build-dependencies; a
+      missing debian/control.stub is an error if and only if there are
+      architecture-specific build-dependencies.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Fri, 31 Jul 2015 16:17:27 +0100
+
+kernel-wedge (2.90) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * copy-modules: Add a trailing slash to the find command searching for
+    modules list. It allows the use of symlinks by looking at the content of
+    the directory they are pointing to instead of the symlinks themselves.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 12 Sep 2014 23:23:31 +0200
+
+kernel-wedge (2.89ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Firmware udeb handling (copy-firmware and related changes).
+    - gen-control: Emit debian/control.stub if it exists regardless of
+      whether there are any architecture-specific build-dependencies; a
+      missing debian/control.stub is an error if and only if there are
+      architecture-specific build-dependencies.
+
+ -- Andy Whitcroft <apw@canonical.com>  Wed, 14 May 2014 14:07:13 +0100
+
+kernel-wedge (2.89) unstable; urgency=medium
+
+  [ Ben Hutchings ]
+  * debian/control: Set Multi-Arch: foreign to support cross-building
+    of linux (Closes: #745555)
+
+ -- Cyril Brulebois <kibi@debian.org>  Tue, 22 Apr 2014 22:25:58 +0200
+
+kernel-wedge (2.88) unstable; urgency=low
+
+  [ Robert Millan ]
+  * Add trailing slash in copy-modules to avoid breakage with symlinks.
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 11 Sep 2013 07:12:05 +0200
+
 kernel-wedge (2.87ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru kernel-wedge-2.87ubuntu1/debian/control kernel-wedge-2.90ubuntu2/debian/control
--- kernel-wedge-2.87ubuntu1/debian/control	2013-07-30 12:32:56.000000000 +0000
+++ kernel-wedge-2.90ubuntu2/debian/control	2014-09-13 04:11:55.000000000 +0000
@@ -12,6 +12,7 @@
 Package: kernel-wedge
 Architecture: all
 Depends: ${misc:Depends}, debhelper (>= 9), make
+Multi-Arch: foreign
 Description: udeb package builder for Debian-Installer
  kernel-wedge splits udeb packages out of a kernel image deb. The udebs
  are used by the Debian-Installer.