diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 67ff3f116a..aa714f6a0b 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -3631,7 +3631,7 @@ gst_matroska_demux_parse_metadata_id_simple_tag (GstMatroskaDemux * demux,
     GstEbmlRead * ebml, GstTagList ** p_taglist)
 {
   /* FIXME: check if there are more useful mappings */
-  struct
+  static const struct
   {
     const gchar *matroska_tagname;
     const gchar *gstreamer_tagname;
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 0c199c9344..7dd9d55382 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -2169,7 +2169,7 @@ gst_matroska_mux_write_simple_tag (const GstTagList * list, const gchar * tag,
     gpointer data)
 {
   /* TODO: more sensible tag mappings */
-  struct
+  static const struct
   {
     const gchar *matroska_tagname;
     const gchar *gstreamer_tagname;