diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 86eb4d48c2..600a6f50ca 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -53,9 +53,6 @@ IGNORE_CFILES =
EXTRA_HFILES = \
$(top_srcdir)/ext/aalib/gstaasink.h \
- $(top_srcdir)/ext/cairo/gsttextoverlay.h \
- $(top_srcdir)/ext/cairo/gsttimeoverlay.h \
- $(top_srcdir)/ext/cairo/gstcairorender.h \
$(top_srcdir)/ext/cairo/gstcairooverlay.h \
$(top_srcdir)/ext/dv/gstdvdec.h \
$(top_srcdir)/ext/dv/gstdvdemux.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 9467da1236..d055cc4072 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -52,9 +52,6 @@
-
-
-
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 7081885700..656d40554b 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -471,49 +471,6 @@ GST_IS_CACASINK_CLASS
gst_cacasink_get_type
-
-element-cairotextoverlay
-cairotextoverlay
-GstCairoTextOverlay
-
-GstCairoTextOverlayClass
-GST_TYPE_CAIRO_TEXT_OVERLAY
-GST_CAIRO_TEXT_OVERLAY
-GST_CAIRO_TEXT_OVERLAY_CLASS
-GST_IS_CAIRO_TEXT_OVERLAY
-GST_IS_CAIRO_TEXT_OVERLAY_CLASS
-GST_CAIRO_TEXT_OVERLAY_GET_CLASS
-gst_text_overlay_get_type
-GstCairoTextOverlayHAlign
-GstCairoTextOverlayVAlign
-
-
-
-element-cairotimeoverlay
-cairotimeoverlay
-GstCairoTimeOverlay
-
-GstCairoTimeOverlayClass
-GST_TYPE_CAIRO_TIME_OVERLAY
-GST_CAIRO_TIME_OVERLAY
-GST_CAIRO_TIME_OVERLAY_CLASS
-GST_IS_CAIRO_TIME_OVERLAY
-GST_IS_CAIRO_TIME_OVERLAY_CLASS
-gst_cairo_time_overlay_get_type
-
-
-
-element-cairorender
-cairorender
-GstCairoRender
-
-GstCairoRenderClass
-GST_TYPE_CAIRO_RENDER
-GST_CAIRO_RENDER
-GST_CAIRO_RENDER_CLASS
-gst_cairo_render_get_type
-
-
element-cairooverlay
cairooverlay
diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index faa70c12d0..51c6241cad 100644
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -109,6 +109,7 @@ GObject
GstAgingTV
GstAlpha
GstAlphaColor
+ GstCairoOverlay
GstDiceTV
GstEdgeTV
GstGamma
diff --git a/docs/plugins/inspect/plugin-cairo.xml b/docs/plugins/inspect/plugin-cairo.xml
index 1691a118ee..0b29b3ea6f 100644
--- a/docs/plugins/inspect/plugin-cairo.xml
+++ b/docs/plugins/inspect/plugin-cairo.xml
@@ -3,7 +3,7 @@
Cairo-based elements
../../ext/cairo/.libs/libgstcairo.so
libgstcairo.so
- 0.10.30.1
+ 1.1.0.1
LGPL
gst-plugins-good
GStreamer Good Plug-ins git
@@ -20,82 +20,13 @@
sink
sink
always
- video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+ video/x-raw, format=(string){ BGRx, BGRA }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
src
source
always
- video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
-
-
-
-
- cairorender
- Cairo encoder
- Codec/Encoder
- Encodes streams using Cairo
- Lutz Mueller <lutz@topfrose.de>
-
-
- sink
- sink
- always
- video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y800, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)8, depth=(int)8, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; image/png, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]
-
-
- src
- source
- always
- application/pdf, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]; application/postscript, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]; image/svg+xml, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]; image/png, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]
-
-
-
-
- cairotextoverlay
- Text overlay
- Filter/Editor/Video
- Adds text strings on top of a video buffer
- David Schleef <ds@schleef.org>
-
-
- text_sink
- sink
- always
- text/plain
-
-
- video_sink
- sink
- always
- video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
-
-
- src
- source
- always
- video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
-
-
-
-
- cairotimeoverlay
- Time overlay
- Filter/Editor/Video
- Overlays the time on a video stream
- David Schleef <ds@schleef.org>
-
-
- sink
- sink
- always
- video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
-
-
- src
- source
- always
- video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+ video/x-raw, format=(string){ BGRx, BGRA }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]