diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index e7c228e78d5c69d2451a4c9b592fdc7233c810e7..68883c7a302b4a77965213025a365d575976595c 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -109,7 +109,6 @@ minimal_armel () {
 		chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
 
 		chroot_enable_bborg_repo="${chroot_enable_bborg_repo}"
-		chroot_enable_xorg="${chroot_enable_xorg}"
 
 		chroot_COPY_SETUP_SDCARD="${chroot_COPY_SETUP_SDCARD}"
 
@@ -333,7 +332,6 @@ chroot_nuke_root_password="enable"
 chroot_script="beagleboard.org.sh"
 
 chroot_enable_bborg_repo="enable"
-chroot_enable_xorg="enable"
 #no_pkgs="enable"
 
 dpkg_arch="armhf"
diff --git a/chroot_script/beagleboard.org.sh b/chroot_script/beagleboard.org.sh
index fdfd22f18ed2c5c0b0954127fbb43a55c56e4b06..fcd8da7635b2ea7a05b70cee3b828144c2c04dcf 100755
--- a/chroot_script/beagleboard.org.sh
+++ b/chroot_script/beagleboard.org.sh
@@ -16,6 +16,30 @@ qemu_warning () {
 	fi
 }
 
+setup_xorg () {
+	echo "Section \"Monitor\"" > /etc/X11/xorg.conf
+	echo "        Identifier      "Builtin Default Monitor"" >> /etc/X11/xorg.conf
+	echo "EndSection" >> /etc/X11/xorg.conf
+	echo "" >> /etc/X11/xorg.conf
+	echo "Section \"Device\"" >> /etc/X11/xorg.conf
+	echo "        Identifier      \"Builtin Default fbdev Device 0\"" >> /etc/X11/xorg.conf
+	echo "        Driver          \"modesetting\"" >> /etc/X11/xorg.conf
+	echo "        Option          \"SWCursor\"      "true"" >> /etc/X11/xorg.conf
+	echo "EndSection" >> /etc/X11/xorg.conf
+	echo "" >> /etc/X11/xorg.conf
+	echo "Section \"Screen\"" >> /etc/X11/xorg.conf
+	echo "        Identifier      \"Builtin Default fbdev Screen 0\"" >> /etc/X11/xorg.conf
+	echo "        Device          \"Builtin Default fbdev Device 0\"" >> /etc/X11/xorg.conf
+	echo "        Monitor         \"Builtin Default Monitor\"" >> /etc/X11/xorg.conf
+	echo "        DefaultDepth    16" >> /etc/X11/xorg.conf
+	echo "EndSection" >> /etc/X11/xorg.conf
+	echo "" >> /etc/X11/xorg.conf
+	echo "Section \"ServerLayout\"" >> /etc/X11/xorg.conf
+	echo "        Identifier      \"Builtin Default Layout\"" >> /etc/X11/xorg.conf
+	echo "        Screen          \"Builtin Default fbdev Screen 0\"" >> /etc/X11/xorg.conf
+	echo "EndSection" >> /etc/X11/xorg.conf
+}
+
 setup_autologin () {
 	if [ -f /etc/lightdm/lightdm.conf ] ; then
 		sed -i -e 's:#autologin-user=:autologin-user=${user_name}:g' /etc/lightdm/lightdm.conf
@@ -110,6 +134,7 @@ install_cloud9 () {
 	umount -l /dev/shm || true
 }
 
+setup_xorg
 setup_autologin
 install_desktop_branding
 install_cloud9
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 424b48918ade5e05bf611f852035560e5c1d7c7a..33acab78d1e4b75551e424c26f50434d16cb34f6 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -639,38 +639,6 @@ chroot_mount
 sudo chroot ${tempdir} /bin/sh chroot_script.sh
 echo "Log: Complete: [sudo chroot ${tempdir} /bin/sh chroot_script.sh]"
 
-if [ "x${chroot_enable_xorg}" = "xenable" ] ; then
-	wfile="xorg.conf"
-	cat > /tmp/${wfile} <<-__EOF__
-		Section "Monitor"
-		        Identifier      "Builtin Default Monitor"
-		EndSection
-
-		Section "Device"
-		        Identifier      "Builtin Default fbdev Device 0"
-		        Driver          "modesetting"
-		#        Option          "HWcursor"      "false"
-		        Option          "SWCursor"      "true"
-		EndSection
-
-		Section "Screen"
-		        Identifier      "Builtin Default fbdev Screen 0"
-		        Device          "Builtin Default fbdev Device 0"
-		        Monitor         "Builtin Default Monitor"
-		        DefaultDepth    16
-		EndSection
-
-		Section "ServerLayout"
-		        Identifier      "Builtin Default Layout"
-		        Screen          "Builtin Default fbdev Screen 0"
-		EndSection
-
-	__EOF__
-
-	sudo mkdir -p ${tempdir}/etc/X11/ || true
-	sudo mv /tmp/${wfile} ${tempdir}/etc/X11/${wfile}
-fi
-
 sudo mkdir -p ${tempdir}/opt/scripts/ || true
 sudo cp -v ${DIR}/scripts_device/*.sh ${tempdir}/opt/scripts/
 sudo chmod +x ${tempdir}/opt/scripts/*.sh