diff --git a/share/arm.tmpl b/share/arm.tmpl
index bdad59ae..610d113c 100644
--- a/share/arm.tmpl
+++ b/share/arm.tmpl
@@ -16,21 +16,26 @@ kernelAddress = { 'baseline' : '0x00008000',
                   'omap'     : '0x80008000',
                   'tegra'    : '0x00008000',
                 }
+
+# keep a comma-delimited list of platforms installed to add to .treeinfo
+platforms = ""
+delimiter = ''
 %>
 
 mkdir ${LIVEDIR}
 install ${runtime_img} ${LIVEDIR}/squashfs.img
 treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
 
-# Add platforms to treeinfo for Beaker support.
-treeinfo ${basearch} platforms highbank,imx,mvebu,omap,tegra
-
 ## install kernels
 mkdir ${KERNELDIR}
 %for kernel in kernels:
     %if kernel.flavor:
         installkernel images-${kernel.flavor}-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
         installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
+<%
+        platforms = platforms + delimiter + kernel.flavor
+        delimiter = ','
+%>
 
         %if doupgrade:
             ## install upgrade image
@@ -107,6 +112,9 @@ mkdir ${KERNELDIR}
     %endif
 %endfor
 
+# add platform to treeinfo for Beaker support
+treeinfo ${basearch} platforms ${platforms}
+
 
 ## FIXME: ARM may need some extra boot config