diff -Nru kernel-wedge-2.96ubuntu2/commands/copy-firmware kernel-wedge-2.96ubuntu3/commands/copy-firmware
--- kernel-wedge-2.96ubuntu2/commands/copy-firmware	2017-05-11 10:28:56.000000000 +0000
+++ kernel-wedge-2.96ubuntu3/commands/copy-firmware	2017-06-28 12:21:44.000000000 +0000
@@ -102,7 +102,7 @@
 			printf $? >&3
 		) | (
 			set +e
-			dir=$home/debian/$i-$version-di/lib/firmware
+			dir=$home/debian/$i-$version-di/lib/firmware/$installedname
 			mkdir -p $dir
 			cd $dir
 			tar xf -
diff -Nru kernel-wedge-2.96ubuntu2/debian/changelog kernel-wedge-2.96ubuntu3/debian/changelog
--- kernel-wedge-2.96ubuntu2/debian/changelog	2017-05-11 10:28:56.000000000 +0000
+++ kernel-wedge-2.96ubuntu3/debian/changelog	2017-06-28 12:21:49.000000000 +0000
@@ -1,3 +1,10 @@
+kernel-wedge (2.96ubuntu3) artful; urgency=low
+
+  * commands/copy-firmware -- ensure we drop the firmware into the
+    versioned directory.  (LP: #1696925)
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Wed, 28 Jun 2017 13:21:49 +0100
+
 kernel-wedge (2.96ubuntu2) artful; urgency=low
 
   * check: suppress error exit from grep when there are no -di packages