diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 66cc4472..037a19d2 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -54,6 +54,8 @@ TABLES = Exif \
          CanonFi \
          CanonPa \
          CanonPr \
+         Casio \
+         Casio2 \
          Fujifilm \
          Minolta \
          MinoltaCsNew \
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 3f63493c..8e810e1a 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -4,6 +4,7 @@
   </ul>
   <ul>
     <li><a href="tags-canon.html"><span>Canon</span></a></li> 
+    <li><a href="tags-casio.html"><span>Casio</span></a></li> 
     <li><a href="tags-fujifilm.html"><span>Fujifilm</span></a></li> 
     <li><a href="tags-minolta.html"><span>Minolta</span></a></li> 
     <li><a href="tags-nikon.html"><span>Nikon</span></a></li> 
diff --git a/doc/templates/__makernotes__ b/doc/templates/__makernotes__
index c79b4cf2..d7ff1d3d 100644
--- a/doc/templates/__makernotes__
+++ b/doc/templates/__makernotes__
@@ -20,7 +20,7 @@
    </tr>
   </thead>
   <tbody>
-   <tr> 
+   <tr>
     <td>Canon</td>
     <td>IFD</td>
     <td>None</td>
@@ -29,16 +29,25 @@
     <td><a href="#R2">[2]</a></td>
     <td>Some CR2 images have a non-zero next-IFD pointer</td>
    </tr>
-   <tr> 
-    <td>Casio</td>
+   <tr>
+    <td>CASIO</td>
     <td>IFD</td>
-    <td>-</td>
-    <td>-</td>
-    <td>-</td>
+    <td>None</td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
     <td><a href="#R4">[4]</a></td>
-    <td>Not supported by Exiv2 yet</td>
+    <td>&nbsp;</td>
    </tr>
-   <tr> 
+   <tr>
+    <td>CASIO</td>
+    <td>IFD, at offset 6</td>
+    <td>"QVC\0\0\0"</td>
+    <td>Big-endian (MM)</td>
+    <td>Relative to the beginning of the makernote</td>
+    <td><a href="#R4">[4]</a></td>
+    <td>&nbsp;</td>
+   </tr>
+   <tr>
     <td>FUJI</td>
     <td>IFD, usually at offset 12</td>
     <td>Starts with the string &quot;FUJI&quot; 
diff --git a/doc/templates/makernote.html.in b/doc/templates/makernote.html.in
index c3638856..3f370909 100644
--- a/doc/templates/makernote.html.in
+++ b/doc/templates/makernote.html.in
@@ -79,6 +79,7 @@ __makernotes__
   PHP JPEG Metadata Toolkit</a> by Evan Hunter<br>
   <a name="R10">[10]</a> <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a>, the most complete and up-to-date tool for reading and writing meta information in image files, by Phil Harvey<br>
   <a name="R11">[11]</a> <a href="http://www.gvsoft.homedns.org/exif/makernote-pentax-type3.html">EXIF: Pentax type3 Makernotes</a> by Ger Vermeulen</p>
+  <a name="R12">[12]</a> <a href="http://www.gvsoft.homedns.org/exif/makernote-casio-type1.html">Casio MakerNote Information</a>
 </div>
 <!-- closes content -->
 
diff --git a/doc/templates/tags-casio.html.in b/doc/templates/tags-casio.html.in
new file mode 100644
index 00000000..572176f6
--- /dev/null
+++ b/doc/templates/tags-casio.html.in
@@ -0,0 +1,32 @@
+__doctype__
+<html>
+__header2__
+<body>
+
+<div id="content">
+__index1__
+__index2__
+<p>There are two different Casio MakerNote formats. Exiv2 will automatically detect the correct format for the Exif data from a particular Casio camera model. 
+References: <a href="makernote.html#R9">[9]</a>, <a href="makernote.html#R10">[10]</a>, <a href="makernote.html#R12">[12]</a>.</p>
+
+<h2>Casio (format 1) MakerNote Tags defined in Exiv2</h2>
+<div>
+<p>Tags found in the MakerNote of images taken with older Casio cameras.</p>
+<p>Click on a column header to sort the table.</p>
+</div>
+__Casio__
+<br>
+
+<h2>Casio (format 2) MakerNote Tags defined in Exiv2</h2>
+<div>
+<p>Tags found in the MakerNote of images taken with newer Casio cameras.</p>
+<p>Click on a column header to sort the table.</p>
+</div>
+__Casio2__
+<br>
+
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff --git a/website/Makefile b/website/Makefile
index e7e9d6a8..3234cda9 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -6,6 +6,8 @@ TABLES = Exif \
          CanonPi \
          CanonFi \
          CanonPa \
+         Casio \
+         Casio2 \
          Fujifilm \
          Minolta \
          MinoltaCsNew \
diff --git a/website/master/makernote.html.in b/website/master/makernote.html.in
index 7fda5099..1fc78325 100644
--- a/website/master/makernote.html.in
+++ b/website/master/makernote.html.in
@@ -76,6 +76,8 @@ __makernotes__
   Various Makernote specifications</a> from the <a href="http://www.ozhiker.com/electronics/pjmt/index.html">
   PHP JPEG Metadata Toolkit</a> by Evan Hunter<br>
   <a name="R10">[10]</a> <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a>, the most complete and up-to-date tool for reading and writing meta information in image files, by Phil Harvey</p>
+  <a name="R11">[11]</a> <a href="http://www.gvsoft.homedns.org/exif/makernote-pentax-type3.html">EXIF: Pentax type3 Makernotes</a> by Ger Vermeulen</p>
+  <a name="R12">[12]</a> <a href="http://www.gvsoft.homedns.org/exif/makernote-casio-type1.html">Casio MakerNote Information</a>
 
 </div><!-- /.container -->
 __footer__
diff --git a/website/master/metadata.html.in b/website/master/metadata.html.in
index 97629cc6..4dadf2f4 100644
--- a/website/master/metadata.html.in
+++ b/website/master/metadata.html.in
@@ -64,6 +64,7 @@ __navbar__
       <ul>
 	<li><a href="tags.html">Standard Exif tags</a></li>
 	<li><a href="tags-canon.html">Canon MakerNote tags</a></li>
+	<li><a href="tags-casio.html">Casio MakerNote tags</a></li>
 	<li><a href="tags-fujifilm.html">Fujifilm MakerNote tags</a></li>
 	<li><a href="tags-minolta.html">Minolta MakerNote tags</a></li>
 	<li><a href="tags-nikon.html">Nikon MakerNote tags</a></li>
diff --git a/website/master/tags-casio.html.in b/website/master/tags-casio.html.in
new file mode 100644
index 00000000..38fc932b
--- /dev/null
+++ b/website/master/tags-casio.html.in
@@ -0,0 +1,32 @@
+__doctype__
+<html lang="en">
+__header4__
+<body>
+__navbar__
+
+<div class="container">
+  <div class="page-header">
+    <h1>Metadata reference tables</h1>
+  </div>
+<p>There are two different Casio MakerNote formats. Exiv2 will automatically detect the correct format for the Exif data from a particular Casio camera model. 
+References: <a href="makernote.html#R9">[9]</a>, <a href="makernote.html#R10">[10]</a>, <a href="makernote.html#R12">[12]</a>.</p>
+
+<h2>Casio (format 1) MakerNote Tags defined in Exiv2</h2>
+<div>  
+<p>Tags found in the MakerNote of images taken with older Casio cameras.</p>
+</div>
+__Casio__
+<br>
+
+<h2>Casio (format 2) MakerNote Tags defined in Exiv2</h2>
+<div>
+<p>Tags found in the MakerNote of images taken with newer Casio cameras.</p>
+</div>
+__Casio2__
+<br>
+
+</div><!-- /.container -->
+__footer__
+__bootstrap__
+</body>
+</html>
