diff --git a/doc/include/exiv2-components.gif b/doc/include/exiv2-components.gif
deleted file mode 100644
index f3bf7c03..00000000
Binary files a/doc/include/exiv2-components.gif and /dev/null differ
diff --git a/doc/include/exiv2-components.png b/doc/include/exiv2-components.png
new file mode 100644
index 00000000..5cb7ae70
Binary files /dev/null and b/doc/include/exiv2-components.png differ
diff --git a/doc/index.html b/doc/index.html
index 7ecbaddf..0f2a1a39 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -6,6 +6,6 @@
   <meta http-equiv="refresh" content="0; URL=html/index.html">
 </head>
 <body>
-<p><a href="index/index.html">Click here to continue</a> if you see this page for more than a moment...</p>
+<p><a href="html/index.html">Click here to continue</a> if you see this page for more than a moment...</p>
 </body>
 </html>
diff --git a/doc/templates/getting-started.html.in b/doc/templates/getting-started.html.in
index b8e89770..015a9c66 100644
--- a/doc/templates/getting-started.html.in
+++ b/doc/templates/getting-started.html.in
@@ -98,7 +98,7 @@ own header and source files.</p>
 
 <center>
 <h3><a class="anchor">Exiv2 Components Diagram</a></h3>
-<p><img src="../include/exiv2-components.gif" width="660" height="543" alt="Exiv2 components diagram"></p>
+<p><img src="../include/exiv2-components.png" width="660" height="543" alt="Exiv2 components diagram"></p>
 </center>
 <p>&nbsp;</p>
 
