diff --git a/initrd/bin/cbfs-init b/initrd/bin/cbfs-init
index 5108159d..7589890f 100755
--- a/initrd/bin/cbfs-init
+++ b/initrd/bin/cbfs-init
@@ -8,11 +8,11 @@ if [ -z "$CBFS_PCR" ]; then
 fi
 
 # Load individual files
-cbfsfiles=`cbfs -t 50 -l 2>/dev/null | grep "^initrd/"` \
+cbfsfiles=`cbfs -t 50 -l 2>/dev/null | grep "^heads/initrd/"` \
 	|| die "cbfs list files failed"
 
 for cbfsname in `echo $cbfsfiles`; do
-	filename=${cbfsname:6}
+	filename=${cbfsname:12}
 	if [ ! -z "$filename" ]; then
 		echo "Loading $filename from CBFS"
 		mkdir -p `dirname $filename` \