diff --git a/chroot_script/beagleboard.org.sh b/chroot_script/beagleboard.org.sh
index f92577ec9114a03da8690c46d48ffec3d5cffff5..c41809f9045ab54be6ce6b8941a79e30e4f1c24c 100755
--- a/chroot_script/beagleboard.org.sh
+++ b/chroot_script/beagleboard.org.sh
@@ -71,6 +71,10 @@ install_desktop_branding () {
 	chown -R ${user_name}:${user_name} /home/${user_name}/.config/
 }
 
+dogtag () {
+	echo "BeagleBoard.org BeagleBone Debian Image ${time}" > /etc/dogtag
+}
+
 install_cloud9 () {
 	mount -t tmpfs shmfs -o size=256M /dev/shm
 	#df -Th
@@ -146,5 +150,6 @@ unseure_root () {
 setup_xorg
 setup_autologin
 install_desktop_branding
+dogtag
 install_cloud9
 unsecure_root
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 68a84a2f032a78a6e64318dd1252aa5bdb48d3dd..fbba9d986fbc8ebed77180cea5a6ec1a1d5e3b85 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -633,10 +633,6 @@ sudo mkdir -p ${tempdir}/opt/scripts/ || true
 sudo cp -v ${DIR}/scripts_device/*.sh ${tempdir}/opt/scripts/
 sudo chmod +x ${tempdir}/opt/scripts/*.sh
 
-if [ "x${chroot_enable_bborg_repo}" = "xenable" ] ; then
-	echo "BeagleBoard.org BeagleBone Debian Image ${time}"| sudo tee ${tempdir}/etc/dogtag >/dev/null
-fi
-
 if [ -n "${chroot_script}" -a -r "${DIR}/chroot_script/${chroot_script}" ] ; then
 	report_size
 	echo "Calling chroot_script script: ${chroot_script}"