diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index 96eaae76..ecd23c40 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -11,8 +11,9 @@ XSERVER = "xserver-xorg \
            xserver-xorg-extension-dri \
            xserver-xorg-extension-dri2 \
            xserver-xorg-extension-glx \
+           xserver-xorg-module-exa \
            xf86-input-evdev \
-           xf86-video-fbdev" 
+           xf86-video-omap"
 
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r1"
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf
index 0d6ab435..87ded4dd 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf
@@ -1,29 +1,15 @@
-Section "Module"                                       
-        Load    "extmod"                                
-        Load    "dbe"                           
-        Load    "glx"                                           
-        Load    "freetype"                             
-        Load    "type1"                        
-        Load    "record"                    
-        Load    "dri"                       
-EndSection                            
+# more /usr/share/X11/xorg.conf.d/99-omap.conf 
+# X.Org X server configuration file
 
-Section "Monitor"                                                                    
-        Identifier      "Builtin Default Monitor"
-EndSection                                       
+Section "Device"
+        Identifier      "Video Device"
+        Driver          "omap"
+        Option          "Debug"         "false"
+        Option          "HWcursor"      "false"
+EndSection
 
-Section "Device"                                  
-        Identifier      "Builtin Default fbdev Device 0"
-        Driver  "fbdev"
-EndSection                                                
-
-Section "Screen"                                        
-        Identifier      "Builtin Default fbdev Screen 0"     
-        Device  "Builtin Default fbdev Device 0"            
-        Monitor "Builtin Default Monitor"               
-EndSection                                              
-
-Section "ServerLayout"                                 
-        Identifier      "Builtin Default Layout"                                     
-        Screen  "Builtin Default fbdev Screen 0"        
-EndSection                                              
+Section "Screen"
+        Identifier      "Screen"
+        Monitor         "Monitor"
+        Device          "Video Device"
+EndSection