diff --git a/language/control-structures/goto.xml b/language/control-structures/goto.xml
index afe2c93553..b68d4ca2b6 100644
--- a/language/control-structures/goto.xml
+++ b/language/control-structures/goto.xml
@@ -11,9 +11,9 @@
     <imagedata fileref="en/language/figures/xkcd-goto.png" format="PNG"/>
    </imageobject>
    <caption>
-    <para>
+    <simpara>
      Image courtesy of <link xlink:href="&url.xkcd;292">xkcd</link>
-    </para>
+    </simpara>
    </caption>
   </mediaobject>
  </para>
diff --git a/security/database.xml b/security/database.xml
index 66fe042bfd..354d833be2 100644
--- a/security/database.xml
+++ b/security/database.xml
@@ -343,8 +343,12 @@ $result = mssql_query($query);
       <imageobject>
        <imagedata fileref="en/security/figures/xkcd-bobby-tables.png" format="PNG"/>
       </imageobject>
+      <caption>
+       <simpara>
+        Image courtesy of <link xlink:href="&url.xkcd;327">xkcd</link>
+       </simpara>
+      </caption>
      </mediaobject>
-     Image courtesy of <link xlink:href="&url.xkcd;327">xkcd</link>
     </para>
 
     <sect2 xml:id="security.database.avoiding">