diff --git a/docs/manual/basics-helloworld.xml b/docs/manual/basics-helloworld.xml
index 393f58cf47..cfcd285f6a 100644
--- a/docs/manual/basics-helloworld.xml
+++ b/docs/manual/basics-helloworld.xml
@@ -16,7 +16,7 @@
     </para>
 
     <programlisting>
-      
+/* example-begin helloworld.c */      
 #include &lt;gst/gst.h&gt;
 
 int 
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
   gst_init(&amp;argc, &amp;argv);
 
   if (argc != 2) {
-    g_print ("usage: %s &lt;filename&gt;\n", argv[0]);
+    g_print ("usage: %s &lt;mp3 filename&gt;\n", argv[0]);
     exit (-1);
   }
 
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
 
   exit (0);
 }
-
+/* example-end helloworld.c */      
     </programlisting>
 
     <para>
@@ -72,7 +72,8 @@ main (int argc, char *argv[])
     </para>
 
     <para>
-      The first thing you have to do is to include the standard <application>GStreamer</application> headers and 
+      The first thing you have to do is to include the standard 
+      <application>GStreamer</application> headers and 
       initialize the framework.
     </para>
     <programlisting>
diff --git a/docs/manual/helloworld.xml b/docs/manual/helloworld.xml
index 393f58cf47..cfcd285f6a 100644
--- a/docs/manual/helloworld.xml
+++ b/docs/manual/helloworld.xml
@@ -16,7 +16,7 @@
     </para>
 
     <programlisting>
-      
+/* example-begin helloworld.c */      
 #include &lt;gst/gst.h&gt;
 
 int 
@@ -27,7 +27,7 @@ main (int argc, char *argv[])
   gst_init(&amp;argc, &amp;argv);
 
   if (argc != 2) {
-    g_print ("usage: %s &lt;filename&gt;\n", argv[0]);
+    g_print ("usage: %s &lt;mp3 filename&gt;\n", argv[0]);
     exit (-1);
   }
 
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
 
   exit (0);
 }
-
+/* example-end helloworld.c */      
     </programlisting>
 
     <para>
@@ -72,7 +72,8 @@ main (int argc, char *argv[])
     </para>
 
     <para>
-      The first thing you have to do is to include the standard <application>GStreamer</application> headers and 
+      The first thing you have to do is to include the standard 
+      <application>GStreamer</application> headers and 
       initialize the framework.
     </para>
     <programlisting>
diff --git a/docs/manual/helloworld2.xml b/docs/manual/helloworld2.xml
index 14b83d0e8e..f1fe2ef47a 100644
--- a/docs/manual/helloworld2.xml
+++ b/docs/manual/helloworld2.xml
@@ -18,6 +18,7 @@
     </para>
 
     <programlisting>
+/* example-begin helloworld.c */
 #include &lt;gst/gst.h&gt;
 
 static void 	gst_play_have_type 	(GstElement *typefind, GstCaps *caps, GstElement *pipeline);
@@ -78,6 +79,7 @@ main (int argc, char *argv[])
 
   exit(0);
 }
+/* example-end helloworld.c */
     </programlisting>
     <para>
       We start by constructing a 'filesrc' element and an 'autobin' element that