diff --git a/helpers/make-mate-tweak b/helpers/make-mate-tweak
index fffd8b93fae3d5a3a50955fc0ab2f94562b534fe..8a1346e58a0f859877b952aaec5d044645bb8fdd 100644
--- a/helpers/make-mate-tweak
+++ b/helpers/make-mate-tweak
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=11
+VERSION=12
 
 . ./config
 
@@ -51,8 +51,12 @@ WINDOW_MANAGER=xterm
 [ -f /usr/bin/marco ] && WINDOW_MANAGER=marco
 [ -f /usr/bin/marco-no-composite ] && WINDOW_MANAGER=marco-no-composite
 
-if glxinfo | grep -q Accelerated.*yes  && [ -f /usr/bin/picom ] && [ -f /usr/bin/marco-xrender ] ; then
-    WINDOW_MANAGER=marco-xrender
+if glxinfo -B | grep "OpenGL renderer string" | grep -qv llvmpipe ; then
+    if [ -f /usr/bin/picom ] && [ -f /usr/bin/marco-xrender ] ; then
+        WINDOW_MANAGER=marco-xrender
+    else
+        WINDOW_MANAGER=marco
+    fi
 fi
 
 gsettings set org.mate.session.required-components windowmanager \$WINDOW_MANAGER