diff --git a/debian/changelog b/debian/changelog
index ca0a5835..9d00bef2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,14 @@ debian-cd (3.1.3) UNRELEASED; urgency=low
     large to fit. If we have to remove packages and their dependencies,
     list them in README.excluded in the root of disc 1.
 
+  [ Joey Hess ]
+  * Add firmware-linux-nonfree to firmware list. Left firmware-linux for now
+    though it is now only a dependency package.
+  * Add firmware-linux-free to firmware list, as a convenient way to make
+    it available along with the other firmware files. (It could, instead,
+    be included directly in d-i images, if there were a udeb.)
+    Closes: 566561
+
  -- Frans Pop <fjp@debian.org>  Sun, 23 Aug 2009 08:59:25 +0200
 
 debian-cd (3.1.2) unstable; urgency=low
diff --git a/tasks/firmware b/tasks/firmware
index 793f649a..311751cf 100644
--- a/tasks/firmware
+++ b/tasks/firmware
@@ -7,7 +7,10 @@ firmware-ipw2x00
 firmware-ipw3945
 firmware-iwlwifi
 firmware-linux
+firmware-linux-nonfree
 firmware-qlogic
 firmware-ralink
 libertas-firmware
 zd1211-firmware
+/* This firmware is free, but it is convenient to include it here. */
+firmware-linux-free