diff --git a/helpers/DATA/mate-session-manager/mate-wm b/helpers/DATA/mate-session-manager/mate-wm
index d819672afdfbfd5477098482d056bbe44b23e68c..2b73e4c61bfb138d89f51aff738a9159103164d2 100755
--- a/helpers/DATA/mate-session-manager/mate-wm
+++ b/helpers/DATA/mate-session-manager/mate-wm
@@ -72,7 +72,8 @@ if [ -z "$WINDOW_MANAGER" ] ; then
   # marco is still the default wm in MATE
   KNOWN_WM="marco $KNOWN_WM"
 
-  xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
+  #xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
+  glxinfo |grep "OpenGL renderer"| grep -vi Gallium | grep -q .
   IS_X_COMPOSITED=$?
   if [ $IS_X_COMPOSITED -eq 0 ] ; then
     KNOWN_WM="marco-compton mutter compiz-manager compiz beryl $KNOWN_WM"
diff --git a/helpers/make-mate-session-manager b/helpers/make-mate-session-manager
index cfce16b6e71f8e5087a5512c1e957065c9fa3db7..ec8e10de49e53f5bd3b8b5f80a2619fffb42abd4 100644
--- a/helpers/make-mate-session-manager
+++ b/helpers/make-mate-session-manager
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 
 . ./config