diff --git a/ChangeLog b/ChangeLog
index 2f3290e..6474f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
+  Change into initramfs-firmware-temp/ instead of
+  initramfs-firmware-temp/lib/firmware/ before doing cpio
+
   12 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc,
   genkernel:
   Added a small debug statement to generic/linuxrc so we know when we're
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 761f0fa..0cb7f80 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -261,7 +261,7 @@ append_firmware() {
 	then
 		rm -r "${TEMP}/initramfs-firmware-temp/"
 	fi
-	mkdir -p "${TEMP}/initramfs-firmware-temp/lib/firmware"
+	mkdir -p "${TEMP}/initramfs-firmware-temp"
 	cd "${TEMP}/initramfs-firmware-temp/lib/firmware"
 	if [ -n "${FIRMWARE_FILES}" ]
 	then