diff --git a/debian/changelog b/debian/changelog
index cbd5cf4..c1e667c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+raspi-config (20161207) jessie; urgency=medium
+
+  * Use compton for compositing with GL driver instead of xcompmgr
+
+ -- Simon Long <simon@raspberrypi.org>  Wed, 07 Dec 2016 12:43:26 +0000
+
+raspi-config (20161206) jessie; urgency=medium
+
+  * Menus reorganised; resolution setting added
+
+ -- Simon Long <simon@raspberrypi.org>  Tue, 06 Dec 2016 13:43:32 +0000
+
 raspi-config (20161114) jessie; urgency=medium
 
   * Restore -a option for xcompmgr; disable splash screen with GL driver
diff --git a/raspi-config b/raspi-config
index dacb28a..db57c97 100755
--- a/raspi-config
+++ b/raspi-config
@@ -1127,10 +1127,6 @@ do_gldriver() {
     whiptail --msgbox "libgl1-mesa-dri not found - please install" 20 60 2
     return 1
   fi
-  if [ ! -e /usr/bin/xcompmgr ]; then
-    whiptail --msgbox "xcompmgr not found - please install" 20 60 2
-    return 1
-  fi
 
   DEFAULT=--defaultno
   CURRENT=0
@@ -1160,13 +1156,16 @@ do_gldriver() {
     cat << EOF > /etc/xdg/autostart/xcompmgr.desktop
 [Desktop Entry]
 Type=Application
-Name=xcompmgr
-Comment=Start simple compositor
+Name=compton
+Comment=Start Compton compositor
 NoDisplay=true
-Exec=xcompmgr -a
+Exec=compton --backend glx --unredir-if-possible --glx-swap-method buffer-age --glx-no-stencil --paint-on-overlay --vsync opengl
 EOF
     mv /usr/share/X11/xorg.conf.d/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~
     sed $CONFIG -i -e "s/^gpu_mem/#gpu_mem/"
+    if [ ! -e /usr/bin/compton ]; then
+      sudo apt-get -y install compton
+     fi
     STATUS=enabled
   elif [ $RET -eq 1 ]; then # disable driver
     sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/"