diff --git a/share/efi.tmpl b/share/efi.tmpl
index 1350ebc8..3181eb14 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -35,10 +35,11 @@ ${make_efiboot("images/efiboot.img")}
     replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}
     replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf}
     %if disk:
+        ## FIXME: using root= causes problems with product.img (see bug 811979)
         replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
     %else:
-        ## NOTE: this needs to match the boot.iso label (see x86.tmpl)
-        replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf}
+        ## anaconda can find CDROM devices automatically so no root= is needed
+        replace @ROOT@ '' ${eficonf}
     %endif
     %if efiarch == 'IA32':
         copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
diff --git a/share/ppc.tmpl b/share/ppc.tmpl
index 3ff15da2..65215d65 100644
--- a/share/ppc.tmpl
+++ b/share/ppc.tmpl
@@ -18,7 +18,8 @@ prepboot = ""
 ## with '_', which means we won't need any udev escapes.
 isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel)
 
-rootarg = "root=live:CDLABEL=%s" % isolabel
+## Anaconda finds the CDROM device automatically
+rootarg = ""
 %>
 
 mkdir ${LIVEDIR}
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 023c1af2..0ab19718 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -25,7 +25,8 @@ install boot/memtest* ${BOOTDIR}/memtest
 ## configure bootloader
 replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
 replace @PRODUCT@ '${product.name}'  ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
-replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
+## anaconda will find the CDROM automatically
+replace @ROOT@ '' ${BOOTDIR}/isolinux.cfg
 
 ## install kernels
 mkdir ${KERNELDIR}