diff --git a/doc/tags-fujifilm.xml b/doc/tags-fujifilm.xml
index 9166f3b6..e54f0edb 100644
--- a/doc/tags-fujifilm.xml
+++ b/doc/tags-fujifilm.xml
@@ -122,11 +122,11 @@
       <tagdesc>Blur warning status</tagdesc>
    </ROW>
    <ROW num="15">
-      <tagname>FoxusWarning</tagname>
+      <tagname>FocusWarning</tagname>
       <tagdec>4865</tagdec>
       <taghex>0x1301</taghex>
       <ifd>Makernote</ifd>
-      <key>Makernote.Fujifilm.FoxusWarning</key>
+      <key>Makernote.Fujifilm.FocusWarning</key>
       <tagdesc>Auto Focus warning status</tagdesc>
    </ROW>
    <ROW num="16">
diff --git a/doc/tags-sigma.xml b/doc/tags-sigma.xml
index 09e669e9..f407a5c4 100644
--- a/doc/tags-sigma.xml
+++ b/doc/tags-sigma.xml
@@ -47,7 +47,7 @@
       <taghex>0x0006</taghex>
       <ifd>Makernote</ifd>
       <key>Makernote.Sigma.FocusSetting</key>
-      <tagdesc>Foxus setting</tagdesc>
+      <tagdesc>Focus setting</tagdesc>
    </ROW>
    <ROW num="6">
       <tagname>WhiteBalance</tagname>
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index c4000676..29e2ca0a 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      fujimn.cpp
-  Version:   $Name:  $ $Revision: 1.4 $
+  Version:   $Name:  $ $Revision: 1.5 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   18-Feb-04, ahu: created
              07-Mar-04, ahu: isolated as a separate component
@@ -31,7 +31,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: fujimn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.5 $ $RCSfile: fujimn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -70,7 +70,7 @@ namespace Exiv2 {
         MakerNote::MnTagInfo(0x1031, "PictureMode", "Picture mode setting"),
         MakerNote::MnTagInfo(0x1100, "Continuous", "Continuous shooting or auto bracketing setting"),
         MakerNote::MnTagInfo(0x1300, "BlurWarning", "Blur warning status"),
-        MakerNote::MnTagInfo(0x1301, "FoxusWarning", "Auto Focus warning status"),
+        MakerNote::MnTagInfo(0x1301, "FocusWarning", "Auto Focus warning status"),
         MakerNote::MnTagInfo(0x1302, "AeWarning", "Auto Exposure warning status"),
         // End of list marker
         MakerNote::MnTagInfo(0xffff, "(UnknownFujiMakerNoteTag)", "Unknown FujiMakerNote tag")
diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp
index 705c7820..96b04ff8 100644
--- a/src/sigmamn.cpp
+++ b/src/sigmamn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      sigmamn.cpp
-  Version:   $Name:  $ $Revision: 1.3 $
+  Version:   $Name:  $ $Revision: 1.4 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   02-Apr-04, ahu: created
   Credits:   Sigma and Foveon MakerNote implemented according to the specification
@@ -29,7 +29,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.3 $ $RCSfile: sigmamn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: sigmamn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -58,7 +58,7 @@ namespace Exiv2 {
         MakerNote::MnTagInfo(0x0003, "DriveMode", "Drive Mode"),
         MakerNote::MnTagInfo(0x0004, "ResolutionMode", "Resolution Mode"),
         MakerNote::MnTagInfo(0x0005, "AutofocusMode", "Autofocus mode"),
-        MakerNote::MnTagInfo(0x0006, "FocusSetting", "Foxus setting"),
+        MakerNote::MnTagInfo(0x0006, "FocusSetting", "Focus setting"),
         MakerNote::MnTagInfo(0x0007, "WhiteBalance", "White balance"),
         MakerNote::MnTagInfo(0x0008, "ExposureMode", "Exposure mode"),
         MakerNote::MnTagInfo(0x0009, "MeteringMode", "Metering mode"),