diff --git a/ChangeLog b/ChangeLog
index d233d4572f..0c084d44a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gsturi.c: (gst_element_make_from_uri):
+	  The show must go on, even if the element did not accept
+	  the uri. Fixes endless loop as witnessed in #307804.
+	  
+	* tools/gst-launch.1.in:
+	  Update mp3->ogg transcoding pipeline in examples section
+	  to use rawvorbisenc and oggmux.
+	  
 2005-06-16  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/gstelement.c: (gst_element_link_pads_filtered):
diff --git a/gst/gsturi.c b/gst/gsturi.c
index fce5e454dc..6d75f3776e 100644
--- a/gst/gsturi.c
+++ b/gst/gsturi.c
@@ -488,6 +488,7 @@ gst_element_make_from_uri (const GstURIType type, const gchar * uri,
       gst_object_unref (GST_OBJECT (ret));
       ret = NULL;
     }
+    walk = walk->next;
   }
   g_list_free (possibilities);
 
diff --git a/tools/gst-launch.1.in b/tools/gst-launch.1.in
index 59efa87580..90c241d16e 100644
--- a/tools/gst-launch.1.in
+++ b/tools/gst-launch.1.in
@@ -247,7 +247,7 @@ Use GNOME\-VFS to play an mp3 file located on an SMB server
 .B Format conversion
 
 .B
-        gst\-launch filesrc location=music.mp3 ! mad ! vorbisenc ! filesink location=music.ogg
+        gst\-launch filesrc location=music.mp3 ! mad ! audioscale ! audioconvert ! rawvorbisenc ! oggmux ! filesink location=music.ogg
 .br
 Convert an mp3 music file to an Ogg Vorbis file