diff --git a/configure.ac b/configure.ac
index a21b4428b..c5ecc74c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ MUTTER_PC_MODULES="
    gsettings-desktop-schemas >= 3.7.3
    xcomposite >= 0.2 xfixes xext xdamage xi >= 1.6.0
    xcursor
-   $CLUTTER_PACKAGE >= 1.17.5
+   $CLUTTER_PACKAGE >= 1.19.5
    clutter-wayland-1.0
    clutter-wayland-compositor-1.0
    clutter-egl-1.0
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index c84a1c6bb..88a2016f3 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -528,10 +528,8 @@ meta_compositor_manage (MetaCompositor *compositor)
         }
     }
 
-  clutter_stage_set_paint_callback (CLUTTER_STAGE (compositor->stage),
-                                    after_stage_paint,
-                                    compositor,
-                                    NULL);
+  g_signal_connect (CLUTTER_STAGE (compositor->stage), "after-paint",
+                    G_CALLBACK (after_stage_paint), compositor);
 
   clutter_stage_set_sync_delay (CLUTTER_STAGE (compositor->stage), META_SYNC_DELAY);