diff --git a/gst/shapewipe/gstshapewipe.c b/gst/shapewipe/gstshapewipe.c
index d54de85f45..06aa5b7ea5 100644
--- a/gst/shapewipe/gstshapewipe.c
+++ b/gst/shapewipe/gstshapewipe.c
@@ -127,6 +127,9 @@ GST_DEBUG_CATEGORY_STATIC (gst_shape_wipe_debug);
 
 #define gst_shape_wipe_parent_class parent_class
 G_DEFINE_TYPE (GstShapeWipe, gst_shape_wipe, GST_TYPE_ELEMENT);
+GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (shapewipe, "shapewipe", GST_RANK_NONE,
+    GST_TYPE_SHAPE_WIPE, GST_DEBUG_CATEGORY_INIT (gst_shape_wipe_debug,
+        "shapewipe", 0, "shapewipe element"););
 
 static void
 gst_shape_wipe_class_init (GstShapeWipeClass * klass)
@@ -1133,14 +1136,7 @@ gst_shape_wipe_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (gst_shape_wipe_debug, "shapewipe", 0,
-      "shapewipe element");
-
-  if (!gst_element_register (plugin, "shapewipe", GST_RANK_NONE,
-          GST_TYPE_SHAPE_WIPE))
-    return FALSE;
-
-  return TRUE;
+  return GST_ELEMENT_REGISTER (shapewipe, plugin);
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
diff --git a/gst/shapewipe/gstshapewipe.h b/gst/shapewipe/gstshapewipe.h
index 66731ce72d..374e6c98a8 100644
--- a/gst/shapewipe/gstshapewipe.h
+++ b/gst/shapewipe/gstshapewipe.h
@@ -76,6 +76,8 @@ struct _GstShapeWipeClass
 
 GType gst_shape_wipe_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (shapewipe);
+
 G_END_DECLS
 
 #endif /* __GST_SHAPE_WIPE_H__ */