diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index a1aab1e3..db601924 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -27,14 +27,10 @@
       <br>&nbsp;&nbsp;1) the %MakerNote is not re-located if possible at all, and
       <br>&nbsp;&nbsp;2) %MakerNote %Ifd offsets are re-calculated if the
                          %MakerNote needs to be moved (for known %Ifd %MakerNotes)
-    - new camera make/model specific %MakerNotes can be added to the library with
-      minimum effort in OO-fashion (by subclassing %MakerNote or %IfdMakerNote)
   - extract and delete methods for Exif thumbnails (both, Jpeg and Tiff thumbnails)
   - set methods for Exif thumbnails (Jpeg only, Tiff thumbnails can be set from
     individual tags)
   - complete API documentation (by Doxygen)
-  - generic lower-level classes to access %Ifd (%Image File Directory) data
-    structures
 
   @section getting-started Getting started
 
@@ -53,13 +49,15 @@
   - <A HREF="tags-sony.html">Sony MakerNote tags</A>
   - <A HREF="tags-iptc.html">Iptc datasets</A>
 
-  @section formats Raw File Formats
+  @section formats File Formats
 
+  - Jpeg
   - <A HREF="crw-mapping.html">Canon CRW</A>
+  - TIFF and related RAW formats (Canon CR2, Nikon NEF, Pentax PEF, Sony SR2), read-only
 
   @section supp Support
 
-  <p>There is now a
+  <p>Please write to the 
   <a title="Exiv2 forum" href="http://uk.groups.yahoo.com/group/exiv2">Yahoo! group for Exiv2 help and discussions</a>.</p>
   <p><a title="Join the Exiv2 forum" href="http://uk.groups.yahoo.com/group/exiv2/join">Join the group</a> to post and receive messages or use <em><a title="Post to the Exiv2 forum" href="http://uk.groups.yahoo.com/group/exiv2/post">exiv2user/password</a></em> to post anonymously. Bug reports can be submitted directly to the
 <a title="Issue tracker" href="http://dev.robotbattle.com/bugs/main_page.php"
diff --git a/src/exiv2.1 b/src/exiv2.1
index aa8bc08a..ff0503ba 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -28,8 +28,10 @@ exiv2 \- EXIF/IPTC metadata manipulation tool
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
 .B exiv2
-is a program to read and write EXIF/IPTC
-metadata. Supported image formats are JPEG, Canon CRW and Canon THM.
+is a program to read and write EXIF/IPTC metadata. Supported image
+formats are JPEG, Canon CRW and Canon THM.  Read-only support is
+currently available for TIFF format and includes TIFF-based RAW
+formats such as Nikon NEF, Canon CR2, Sony SR2 and Pentax PEF.
 .SH ACTIONS
 The \fIaction\fP argument is only required if it is not clear which
 action is implied.