diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index cac4dba96f0e271d522c69744f24b5191780f564..8a446dcadce1e6b13f8f850b7a8f8990577ee78c 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -41,7 +41,7 @@ bborg_pkg_list="${bborg_pkg_list} autoconf automake1.9 libtool flex bison gdb pk
 #utils:
 bborg_pkg_list="${bborg_pkg_list} alsa-utils evtest systemd"
 #lxde
-bborg_pkg_list="${bborg_pkg_list} lxde-core slim xserver-xorg-video-modesetting xserver-xorg x11-xserver-utils wicd-gtk"
+bborg_pkg_list="${bborg_pkg_list} lxde-core lightdm xserver-xorg-video-modesetting xserver-xorg x11-xserver-utils wicd-gtk"
 #lxde utils
 bborg_pkg_list="${bborg_pkg_list} leafpad python-opencv libsdl1.2-dev screen"
 
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 9ee1adbe1e868799ae98ecd18f56f8c7eca90c97..b4beea403a92326f0695815168f79b52999d8651 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -509,6 +509,11 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 					wget --no-verbose --directory-prefix=/opt/ http://rcn-ee.net/deb/testing/beaglebg.jpg
 					chown -R ${user_name}:${user_name} /opt/beaglebg.jpg
 
+					if [ -f /etc/lightdm/lightdm.conf ] ; then
+						sed -i -e 's:#autologin-user=:autologin-user=${user_name}:g' /etc/lightdm/lightdm.conf
+						sed -i -e 's:#autologin-session=:autologin-session=LXDE:g' /etc/lightdm/lightdm.conf
+					fi
+
 					mkdir -p /home/${user_name}/.config/pcmanfm/LXDE/ || true
 					echo "[desktop]" > /home/${user_name}/.config/pcmanfm/LXDE/pcmanfm.conf
 					echo "wallpaper_mode=1" >> /home/${user_name}/.config/pcmanfm/LXDE/pcmanfm.conf