diff --git a/ChangeLog b/ChangeLog
index 6e149fe..983b088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
+  Change to new temp directory so the firmware gets copied to the right place
+
   12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
   Copy with -L so we get the file instead of the symlink
 
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 232e39e..761f0fa 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -262,6 +262,7 @@ append_firmware() {
 		rm -r "${TEMP}/initramfs-firmware-temp/"
 	fi
 	mkdir -p "${TEMP}/initramfs-firmware-temp/lib/firmware"
+	cd "${TEMP}/initramfs-firmware-temp/lib/firmware"
 	if [ -n "${FIRMWARE_FILES}" ]
 	then
 		OLD_IFS=$IFS