Index: data/gnome-wm
================================================================================
--- data/Makefile.am
+++ data/Makefile.am
@@ -25,7 +25,7 @@
 bin_SCRIPTS = gnome-wm
 
 settingsdir = $(datadir)/applications
-settings_in_files = session-properties.desktop.in
+settings_in_files = gnome-wm.desktop.in session-properties.desktop.in
 settings_DATA = $(settings_in_files:.desktop.in=.desktop)
 
 install-data-local:
--- data/gnome-wm
+++ data/gnome-wm
@@ -73,6 +73,14 @@
 
   if [ -f "$COMPIZ_ENABLED_FILE" ] ; then
     KNOWN_WM="compiz-manager $KNOWN_WM"
+  else
+      if [ ! -f "$HOME/.config/compiz/disable-compiz" ] ; then
+         # Check to see if hardware is supported by compiz, to have it as default WM if so
+         CM_DRY=yes compiz-manager > /dev/null 2>&1
+         if test $? -eq 0; then
+	     KNOWN_WM="compiz-manager $KNOWN_WM"
+         fi
+      fi
   fi
 
   OLDIFS=$IFS