diff --git a/ChangeLog b/ChangeLog
index e40da34793..5101aa24dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-21  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/apetag/gsttagdemux.c: (gst_tag_demux_get_type):
+	  Rename registered type in preparation of GstTagDemux moving to
+	  -base at some point in the future.
+
 2007-03-19  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers):
diff --git a/gst/apetag/gsttagdemux.c b/gst/apetag/gsttagdemux.c
index b8560b93ab..fde7e52a78 100644
--- a/gst/apetag/gsttagdemux.c
+++ b/gst/apetag/gsttagdemux.c
@@ -177,9 +177,8 @@ gst_tag_demux_get_type (void)
       (GInstanceInitFunc) gst_tag_demux_init
     };
 
-    /* FIXME: register as 'GstApeDemuxBase' for now */
     object_type = g_type_register_static (GST_TYPE_ELEMENT,
-        "GstTagDemux", &object_info, G_TYPE_FLAG_ABSTRACT);
+        "GstApeDemuxBase", &object_info, G_TYPE_FLAG_ABSTRACT);
   }
 
   return object_type;