diff --git a/ChangeLog b/ChangeLog
index 9b0df44f5d..dd08913056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-12  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* configure.ac:
+	  enable shout2 by default
+	* ext/shout2/gstshout2.c: (gst_shout2send_protocol_get_type),
+	(gst_shout2send_base_init), (gst_shout2send_init),
+	(gst_shout2send_connect), (gst_shout2send_change_state):
+	* ext/shout2/gstshout2.h:
+	  make this work again. Based on a patch by Zaheer Merali (fixes
+	  #142262)
+	* ext/theora/theora.c: (plugin_init):
+	  don't set rank on encoders
+
 2004-05-11  Jeremy Simon  <jesimon@libertysurf.fr>
 
 	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_audio_caps):
diff --git a/configure.ac b/configure.ac
index d904f932f1..d2b7898489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,11 +120,9 @@ GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plug-ins],,
 [
   AC_MSG_WARN(building experimental plug-ins)
   USE_TARKIN="yes"
-  USE_SHOUT2="yes"
 ],[
   AC_MSG_NOTICE(not building experimental plug-ins)
   USE_TARKIN="no"
-  USE_SHOUT2="no"
 ])
 
 dnl broken plug-ins; stuff that doesn't seem to build at the moment
diff --git a/ext/theora/theora.c b/ext/theora/theora.c
index af9ae7e034..87def3568b 100644
--- a/ext/theora/theora.c
+++ b/ext/theora/theora.c
@@ -36,7 +36,7 @@ plugin_init (GstPlugin * plugin)
           gst_theora_dec_get_type ()))
     return FALSE;
 
-  if (!gst_element_register (plugin, "theoraenc", GST_RANK_SECONDARY,
+  if (!gst_element_register (plugin, "theoraenc", GST_RANK_NONE,
           gst_theora_enc_get_type ()))
     return FALSE;