diff --git a/ChangeLog b/ChangeLog
index d9a5e2ec5e..6085c7a989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-04-08  Stefan Kost  <ensonic@users.sf.net>
+
+	* ext/amrnb/amrnbdec.c: (gst_amrnbdec_class_init):
+	* ext/amrnb/amrnbenc.c: (gst_amrnbenc_class_init):
+	* ext/amrnb/amrnbparse.c: (gst_amrnbparse_class_init):
+	* ext/mad/gstmad.c: (gst_mad_class_init):
+	* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_class_init):
+	* gst/ac3parse/gstac3parse.c: (gst_ac3parse_class_init):
+	* gst/asfdemux/gstasfmux.c: (gst_asfmux_class_init):
+	* gst/dvdlpcmdec/gstdvdlpcmdec.c: (gst_dvdlpcmdec_class_init):
+	* gst/iec958/ac3iec.c: (ac3iec_class_init):
+	* gst/mpegaudioparse/gstmpegaudioparse.c:
+	(gst_mp3parse_class_init):
+	* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_class_init):
+	* gst/mpegstream/gstmpegclock.c: (gst_mpeg_clock_class_init):
+	* gst/mpegstream/gstrfc2250enc.c: (gst_rfc2250_enc_class_init):
+	* gst/realmedia/rmdemux.c: (gst_rmdemux_class_init):
+	* gst/synaesthesia/gstsynaesthesia.c:
+	(gst_synaesthesia_class_init):
+	Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent)
+
 2006-04-07  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Fabrizio Gennari  <fabrizio dot ge at tiscali dot it>
diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c
index 0749b7c4a7..54d2009bff 100644
--- a/ext/amrnb/amrnbdec.c
+++ b/ext/amrnb/amrnbdec.c
@@ -105,7 +105,7 @@ gst_amrnbdec_class_init (GstAmrnbDecClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   element_class->change_state = gst_amrnbdec_state_change;
 }
diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c
index 4518d3a4a8..ff0224ad73 100644
--- a/ext/amrnb/amrnbenc.c
+++ b/ext/amrnb/amrnbenc.c
@@ -103,7 +103,7 @@ gst_amrnbenc_class_init (GstAmrnbEncClass * klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   object_class->finalize = gst_amrnbenc_finalize;
 
diff --git a/ext/amrnb/amrnbparse.c b/ext/amrnb/amrnbparse.c
index 6bf5de0b0a..5466412a46 100644
--- a/ext/amrnb/amrnbparse.c
+++ b/ext/amrnb/amrnbparse.c
@@ -110,7 +110,7 @@ gst_amrnbparse_class_init (GstAmrnbParseClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   element_class->change_state = gst_amrnbparse_state_change;
 
diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 32bf63b14e..8750e39c71 100644
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -287,7 +287,7 @@ gst_mad_class_init (GstMadClass * klass)
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->set_property = gst_mad_set_property;
   gobject_class->get_property = gst_mad_get_property;
diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index d2e0d7b6a7..c0e4e727ea 100644
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -251,7 +251,7 @@ gst_mpeg2dec_class_init (GstMpeg2decClass * klass)
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->set_property = gst_mpeg2dec_set_property;
   gobject_class->get_property = gst_mpeg2dec_get_property;
diff --git a/gst/ac3parse/gstac3parse.c b/gst/ac3parse/gstac3parse.c
index 9babff0289..12f713a3ff 100644
--- a/gst/ac3parse/gstac3parse.c
+++ b/gst/ac3parse/gstac3parse.c
@@ -170,7 +170,7 @@ gst_ac3parse_class_init (gpointer g_class)
 
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SKIP, g_param_spec_int ("skip", "skip", "skip", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE));      /* CHECKME */
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->set_property = gst_ac3parse_set_property;
   gobject_class->get_property = gst_ac3parse_get_property;
diff --git a/gst/asfdemux/gstasfmux.c b/gst/asfdemux/gstasfmux.c
index 402c559f8b..c230624460 100644
--- a/gst/asfdemux/gstasfmux.c
+++ b/gst/asfdemux/gstasfmux.c
@@ -213,7 +213,7 @@ gst_asfmux_class_init (GstAsfMuxClass * klass)
 
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gstelement_class->request_new_pad = gst_asfmux_request_new_pad;
   gstelement_class->change_state = gst_asfmux_change_state;
diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.c b/gst/dvdlpcmdec/gstdvdlpcmdec.c
index b7b854c4a1..027a140553 100644
--- a/gst/dvdlpcmdec/gstdvdlpcmdec.c
+++ b/gst/dvdlpcmdec/gstdvdlpcmdec.c
@@ -135,7 +135,7 @@ gst_dvdlpcmdec_class_init (GstDvdLpcmDecClass * klass)
 
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gstelement_class->change_state = gst_dvdlpcmdec_change_state;
 }
diff --git a/gst/iec958/ac3iec.c b/gst/iec958/ac3iec.c
index 13851c4cfa..5ed54b17d3 100644
--- a/gst/iec958/ac3iec.c
+++ b/gst/iec958/ac3iec.c
@@ -158,7 +158,7 @@ ac3iec_class_init (AC3IECClass * klass)
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->set_property = ac3iec_set_property;
   gobject_class->get_property = ac3iec_get_property;
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 6aca258139..dfc189c036 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -241,7 +241,7 @@ gst_mp3parse_class_init (GstMPEGAudioParseClass * klass)
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->set_property = gst_mp3parse_set_property;
   gobject_class->get_property = gst_mp3parse_get_property;
diff --git a/gst/mpegstream/gstdvddemux.c b/gst/mpegstream/gstdvddemux.c
index d3d803a853..53930c7041 100644
--- a/gst/mpegstream/gstdvddemux.c
+++ b/gst/mpegstream/gstdvddemux.c
@@ -234,7 +234,7 @@ gst_dvd_demux_class_init (GstDVDDemuxClass * klass)
   GstMPEGParseClass *mpeg_parse_class;
   GstMPEGDemuxClass *mpeg_demux_class;
 
-  parent_class = g_type_class_ref (GST_TYPE_MPEG_DEMUX);
+  parent_class = g_type_class_peek_parent (klass);
 
   gstelement_class = (GstElementClass *) klass;
   mpeg_parse_class = (GstMPEGParseClass *) klass;
diff --git a/gst/mpegstream/gstmpegclock.c b/gst/mpegstream/gstmpegclock.c
index ba350660d0..907fee2dcd 100644
--- a/gst/mpegstream/gstmpegclock.c
+++ b/gst/mpegstream/gstmpegclock.c
@@ -72,7 +72,7 @@ gst_mpeg_clock_class_init (GstMPEGClockClass * klass)
   gstobject_class = (GstObjectClass *) klass;
   gstclock_class = (GstClockClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_SYSTEM_CLOCK);
+  parent_class = g_type_class_peek_parent (klass);
 
   gstclock_class->get_internal_time = gst_mpeg_clock_get_internal_time;
 }
diff --git a/gst/mpegstream/gstrfc2250enc.c b/gst/mpegstream/gstrfc2250enc.c
index c1ce6cdb47..f8bf3935f7 100644
--- a/gst/mpegstream/gstrfc2250enc.c
+++ b/gst/mpegstream/gstrfc2250enc.c
@@ -124,7 +124,7 @@ gst_rfc2250_enc_class_init (GstRFC2250EncClass * klass)
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BIT_RATE,
       g_param_spec_uint ("bit_rate", "bit_rate", "bit_rate",
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index 574b2c448e..72af35c97c 100644
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -205,7 +205,7 @@ gst_rmdemux_class_init (GstRMDemuxClass * klass)
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gstelement_class->change_state = gst_rmdemux_change_state;
 
diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c
index e8317a9a7e..8cbe8a981a 100644
--- a/gst/synaesthesia/gstsynaesthesia.c
+++ b/gst/synaesthesia/gstsynaesthesia.c
@@ -166,7 +166,7 @@ gst_synaesthesia_class_init (GstSynaesthesiaClass * klass)
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
 
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+  parent_class = g_type_class_peek_parent (klass);
 
   gstelement_class->change_state = gst_synaesthesia_change_state;