diff --git a/compiz-manager b/compiz-manager
index aca97a3..e0be62f 100755
--- a/compiz-manager
+++ b/compiz-manager
@@ -27,16 +27,22 @@
 # 
 
 
-COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz
-PLUGIN_PATH="/usr/local/lib/compiz/" 
+BIN_PATH=`which compiz` # For window decorators and compiz
+if [ $COMPIZ_BIN_PATH -e "/usr/bin/compiz" ] ; then
+    COMPIZ_BIN_PATH="/usr/bin/"
+    PLUGIN_PATH="/usr/lib/compiz/"
+else
+    COMPIZ_BIN_PATH="/usr/local/bin"
+    PLUGIN_PATH="/usr/local/lib/compiz/"
+fi
 GLXINFO="/usr/bin/glxinfo"
 KWIN="/usr/bin/kwin"
 METACITY="/usr/bin/metacity"
 COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
 
 # For Xgl LD_PRELOAD
-LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
-LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
+LIBGL_NVIDIA=""
+LIBGL_FGLRX=""
 
 # Minimum amount of memory (in kilo bytes) that nVidia cards need
 # to be allowed to start