diff --git a/debian/changelog b/debian/changelog
index 79ba9349..c4357bab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,14 @@ debian-cd (3.1.14) UNRELEASED; urgency=low
   * Build without isolinux/desktop. Closes: #706150
   * Don't assume loadlin.exe exists. Closes: #706156
 
+  [ Joey Hess ]
+  * Add make and gcc back to forcecd1, to allow building out of tree
+    kernel wifi modules. I removed this and more earlier while cleaning
+    out undocuented cruft.
+    (I have not added back module-assistant so far,
+    since it needs build-essential which would pull in additional
+    dependencies.)
+
  -- Steve McIntyre <93sam@debian.org>  Mon, 06 May 2013 23:26:18 +0100
 
 debian-cd (3.1.13) unstable; urgency=medium
diff --git a/tasks/wheezy/forcd1 b/tasks/wheezy/forcd1
index 4d29b858..df06a327 100644
--- a/tasks/wheezy/forcd1
+++ b/tasks/wheezy/forcd1
@@ -16,3 +16,12 @@ apt-offline
 
 /* #231583: Make life easier for Australian ISP users */
 bpalogin
+
+/* Enough toolchain to build kernel modules. This plus the kernel
+ * headers (which are also included on CDs) is enough to be able to build
+ * out of kernel tree wifi drivers, for example. The user may need to
+ * sneakernet over the source tree; should not need to sneakernet the
+ * toolchain.
+ * (Could be omitted from smaller images if necessary. */
+make
+gcc