diff --git a/docs/manual/bins.sgml b/docs/manual/bins.sgml
index 988687bf63..f6486f99c7 100644
--- a/docs/manual/bins.sgml
+++ b/docs/manual/bins.sgml
@@ -18,7 +18,11 @@
 
   <figure float="1" id="sec-bin-img">
     <title>Visualisation of a <classname>GstBin</classname> element with some elements in it</title>
-    <graphic fileref="images/bin-element" format="png"></graphic>
+      <mediaobject>  
+        <imageobject>
+          <imagedata fileref="images/bin-element" format="PNG">
+        </imageobject>
+      </mediaobject>
   </figure>
 
   <para> 
@@ -170,7 +174,11 @@
     
     <figure float="1" id="sec-bin-ghost-img">
       <title>Visualisation of a <classname>GstBin</classname> element with a ghostpad</title>
-      <graphic fileref="images/bin-element-ghost" format="png"></graphic>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/bin-element-ghost" format="PNG">
+        </imageobject>
+      </mediaobject>  
     </figure>
     <para>
       Above is a representation of a ghostpad. the sinkpad of element one is now also a pad
diff --git a/docs/manual/connections.sgml b/docs/manual/connections.sgml
index ca352dc240..37d1494c55 100644
--- a/docs/manual/connections.sgml
+++ b/docs/manual/connections.sgml
@@ -7,7 +7,11 @@
 
   <figure float="1" id="sec-connection">
     <title>Visualisation of three connected elements</title>
-      <graphic fileref="images/connected-elements" format="png"></graphic>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/connected-elements" format="PNG">
+        </imageobject>
+      </mediaobject>
   </figure>
   <para> 
     By connecting these three elements, we have created a very simple pipeline. The effect
diff --git a/docs/manual/elements.sgml b/docs/manual/elements.sgml
index a01d189b52..58edaab929 100644
--- a/docs/manual/elements.sgml
+++ b/docs/manual/elements.sgml
@@ -34,7 +34,11 @@
       </para>
       <figure float="1" id="sec-element-srcimg">
         <title>Visualisation of a source element</title>
-        <graphic fileref="images/src-element" format="png"></graphic>
+          <mediaobject>  
+            <imageobject>
+              <imagedata fileref="images/src-element" format="PNG">
+            </imageobject>
+          </mediaobject>
       </figure>
       <para>
         Source elements do not accept data, they only generate data. You can see
@@ -59,7 +63,11 @@
       </para> 
       <figure float="1" id="sec-element-filterimg">
         <title>Visualisation of a filter element</title>
-        <graphic fileref="images/filter-element" format="png"></graphic>
+          <mediaobject>  
+            <imageobject>
+              <imagedata fileref="images/filter-element" format="PNG">
+            </imageobject>
+          </mediaobject>
       </figure>
       <para>
         The above figure shows the visualisation of a filter element. This element has 
@@ -69,7 +77,11 @@
       <figure float="1" id="sec-element-multifilterimg">
         <title>Visualisation of a filter element with
 	  more than one output pad</title>
-        <graphic fileref="images/filter-element-multi" format="png"></graphic>
+        <mediaobject>  
+          <imageobject>
+            <imagedata fileref="images/filter-element-multi" format="PNG">
+          </imageobject>
+        </mediaobject>
       </figure>
       <para>
         The above figure shows the visualisation of a filter element with more than one
@@ -89,7 +101,11 @@
       </para> 
       <figure float="1" id="sec-element-sinkimg">
         <title>Visualisation of a sink element</title>
-        <graphic fileref="images/sink-element" format="png"></graphic>
+        <mediaobject>  
+          <imageobject>
+            <imagedata fileref="images/sink-element" format="PNG">
+          </imageobject>
+        </mediaobject>
       </figure>
     </sect2>
   </sect1>
diff --git a/docs/manual/factories.sgml b/docs/manual/factories.sgml
index 62490bb719..73e3ec24a7 100644
--- a/docs/manual/factories.sgml
+++ b/docs/manual/factories.sgml
@@ -88,7 +88,12 @@
     </para>
     <figure float="1" id="sec-mime-img">
       <title>The Hello world pipeline with MIME types</title>
-      <graphic fileref="images/mime-world" format="png"></graphic>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/mime-world" format="PNG">
+        </imageobject>
+      </mediaobject>  
+
     </figure>
     <para>
       We will see how you can create an element based on the MIME types
diff --git a/docs/manual/helloworld.sgml b/docs/manual/helloworld.sgml
index 0adcfc34ed..1002425dca 100644
--- a/docs/manual/helloworld.sgml
+++ b/docs/manual/helloworld.sgml
@@ -201,7 +201,12 @@ main (int argc, char *argv[])
     </para>
     <figure float="1" id="sec-hello-img">
       <title>The Hello world pipeline</title>
-      <graphic fileref="images/hello-world" format="png"></graphic>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/hello-world" format="PNG">
+        </imageobject>
+      </mediaobject>  
+
     </figure>
 
     <para>
diff --git a/docs/manual/queues.sgml b/docs/manual/queues.sgml
index abba7f4d3f..76e4c6b19b 100644
--- a/docs/manual/queues.sgml
+++ b/docs/manual/queues.sgml
@@ -24,7 +24,11 @@
   </para>
   <figure float="1" id="sec-queues-img">
     <title>a two-threaded decoder with a queue</title>
-    <graphic fileref="images/queue" format="png"></graphic>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="images/queue" format="PNG">
+      </imageobject>
+    </mediaobject>  
   </figure>
 
   <para> 
diff --git a/docs/manual/threads.sgml b/docs/manual/threads.sgml
index 2706965955..0a69f6af92 100644
--- a/docs/manual/threads.sgml
+++ b/docs/manual/threads.sgml
@@ -46,7 +46,11 @@
   </para>
   <figure float="1" id="sec-threads-img">
     <title>a thread</title>
-    <graphic fileref="images/thread" format="png"></graphic>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="images/thread" format="PNG">
+      </imageobject>
+    </mediaobject>  
   </figure>
 
   <para>