diff --git a/postplug.d/30xorg b/postplug.d/30xorg
index 871989b..6036882 100644
--- a/postplug.d/30xorg
+++ b/postplug.d/30xorg
@@ -1,6 +1,6 @@
 #!/bin/bash
 # xorg - xorg plugin for postplug
-# Copyright (c) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2004-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (c) 2004-2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 if [ $UID != 0 ]; then
@@ -315,13 +315,10 @@ if [ "$CONFCREATED" = "1" ]; then
    esac
 
    # Compiz/3d configuration options 
-   if [ "$VIDEODRIVER" != "nvidia" ]; then
-      sed -i -e '/Section "Device"/a\
-        Option	"XAANoOffscreenPixmaps" "true"' $XORGCONF
-   elif [ "$VIDEODRIVER" == "nvidia" ]; then
+   if [ "$VIDEODRIVER" == "nvidia" ]; then
       sed -i -e '/Section "Screen"/a\
         Option	"AddARGBGLXVisuals" "true"\
-	Option	"DisableGLXRootClipping" "true"' $XORGCONF
+        Option	"DisableGLXRootClipping" "true"' $XORGCONF
    fi
 
    # configure VirtualBox mouse driver
@@ -512,9 +509,12 @@ sed -i "/[[:space:]]*InputDevice[[:space:]]*.*PS2Mouse.*/d; \
         /[[:space:]]*InputDevice[[:space:]]*.*Synaptics.*/d; \
         /[[:space:]]*InputDevice[[:space:]]*.*Alps.*/d" $XORGCONF
 
-# Remove all devices set
+# remove all devices set
 sed -i "/\W*Option \"Device\".*/d" $XORGCONF
 
+# remove obsoleted XAANoOffscreenPixmaps
+sed -i '/^[[:space:]]*Option[[:space:]]*"XAANoOffscreenPixmaps" "true"/d'
+
 # Configure keyboard
 xorg_d_configure_input