diff --git a/gst/icydemux/gsticydemux.c b/gst/icydemux/gsticydemux.c
index 035e7245f2..c8420e86fc 100644
--- a/gst/icydemux/gsticydemux.c
+++ b/gst/icydemux/gsticydemux.c
@@ -87,7 +87,11 @@ static gboolean gst_icydemux_send_tag_event (GstICYDemux * icydemux,
 
 #define gst_icydemux_parent_class parent_class
 G_DEFINE_TYPE (GstICYDemux, gst_icydemux, GST_TYPE_ELEMENT);
-
+GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (icydemux, "icydemux",
+    GST_RANK_PRIMARY, GST_TYPE_ICYDEMUX,
+    GST_DEBUG_CATEGORY_INIT (icydemux_debug, "icydemux", 0,
+        "GStreamer ICY tag demuxer");
+    );
 static void
 gst_icydemux_class_init (GstICYDemuxClass * klass)
 {
@@ -662,11 +666,8 @@ gst_icydemux_send_tag_event (GstICYDemux * icydemux, GstTagList * tags)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (icydemux_debug, "icydemux", 0,
-      "GStreamer ICY tag demuxer");
+  return GST_ELEMENT_REGISTER (icydemux, plugin);
 
-  return gst_element_register (plugin, "icydemux",
-      GST_RANK_PRIMARY, GST_TYPE_ICYDEMUX);
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
diff --git a/gst/icydemux/gsticydemux.h b/gst/icydemux/gsticydemux.h
index 3f05218ad5..d51a54b0d0 100644
--- a/gst/icydemux/gsticydemux.h
+++ b/gst/icydemux/gsticydemux.h
@@ -82,6 +82,8 @@ struct _GstICYDemuxClass
 
 GType gst_icydemux_get_type (void);
 
+GST_ELEMENT_REGISTER_DECLARE (icydemux);
+
 G_END_DECLS
 
 #endif /* __GST_ICYDEMUX_H__ */