diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index fa2f8e7a55..06a0ecd388 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -2,8 +2,8 @@
 #@NAME: Beagleboard machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
-XSERVER = "xserver-xorg-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
+XSERVER ?= "xserver-xorg-lite \
            xf86-input-evdev \
            xf86-input-mouse \
            xf86-video-omapfb \