diff --git a/ext/gs/gstgs.cpp b/ext/gs/gstgs.cpp
index f5c9ddfafb..94da7ee017 100644
--- a/ext/gs/gstgs.cpp
+++ b/ext/gs/gstgs.cpp
@@ -34,18 +34,15 @@
 #include "gstgssink.h"
 #include "gstgssrc.h"
 
-GST_DEBUG_CATEGORY (gst_gs_src_debug);
-
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "gssrc", GST_RANK_NONE, GST_TYPE_GS_SRC))
-    return FALSE;
+  gboolean ret = FALSE;
 
-  if (!gst_element_register (plugin, "gssink", GST_RANK_NONE, GST_TYPE_GS_SINK))
-    return FALSE;
+  ret |= GST_ELEMENT_REGISTER (gssrc, plugin);
+  ret |= GST_ELEMENT_REGISTER (gssink, plugin);
 
-  return TRUE;
+  return ret;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
diff --git a/ext/gs/gstgssink.cpp b/ext/gs/gstgssink.cpp
index 3fdb7b0f5b..07e44c7a24 100644
--- a/ext/gs/gstgssink.cpp
+++ b/ext/gs/gstgssink.cpp
@@ -168,6 +168,7 @@ static GType gst_gs_sink_next_get_type(void) {
 
 #define gst_gs_sink_parent_class parent_class
 G_DEFINE_TYPE(GstGsSink, gst_gs_sink, GST_TYPE_BASE_SINK);
+GST_ELEMENT_REGISTER_DEFINE (gssink, "gssink", GST_RANK_NONE, GST_TYPE_GS_SINK)
 
 class GSWriteStream {
  public:
diff --git a/ext/gs/gstgssink.h b/ext/gs/gstgssink.h
index e93ac4b1f7..2d61134763 100644
--- a/ext/gs/gstgssink.h
+++ b/ext/gs/gstgssink.h
@@ -43,5 +43,7 @@ typedef enum {
   GST_GS_SINK_NEXT_NONE,
 } GstGsSinkNext;
 
+GST_ELEMENT_REGISTER_DECLARE (gssink);
+
 G_END_DECLS
 #endif // __GST_GS_SINK_H__
diff --git a/ext/gs/gstgssrc.cpp b/ext/gs/gstgssrc.cpp
index c37640bd6d..7a8d36b95c 100644
--- a/ext/gs/gstgssrc.cpp
+++ b/ext/gs/gstgssrc.cpp
@@ -109,6 +109,7 @@ static void gst_gs_src_uri_handler_init(gpointer g_iface, gpointer iface_data);
   GST_DEBUG_CATEGORY_INIT(gst_gs_src_debug, "gssrc", 0, "gssrc element");
 #define gst_gs_src_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE(GstGsSrc, gst_gs_src, GST_TYPE_BASE_SRC, _do_init);
+GST_ELEMENT_REGISTER_DEFINE (gssrc, "gssrc", GST_RANK_NONE, GST_TYPE_GS_SRC)
 
 namespace gcs = google::cloud::storage;
 
diff --git a/ext/gs/gstgssrc.h b/ext/gs/gstgssrc.h
index 717742f124..9a30cd9e25 100644
--- a/ext/gs/gstgssrc.h
+++ b/ext/gs/gstgssrc.h
@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 
 #define GST_TYPE_GS_SRC (gst_gs_src_get_type())
 G_DECLARE_FINAL_TYPE(GstGsSrc, gst_gs_src, GST, GS_SRC, GstBaseSrc)
+GST_ELEMENT_REGISTER_DECLARE (gssrc);
 
 G_END_DECLS
 #endif // __GST_GS_SRC_H__