diff --git a/README.md b/README.md
index d444165b..e8637747 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The file ReadMe.txt in a build bundle describes how to install the library on th
    16. [Cross Platform Build and Test on Linux for MinGW](#2-16)
    17. [Building with C++11 and other compilers](#2-17)
    18. [Static and Shared Libraries](#2-18)
-   19. [Support for bmff files (CR3, HEIF and AVIF)](#2-19)
+   19. [Support for bmff files (CR3, HEIF, HEIC, and AVIF)](#2-19)
 3. [License and Support](#3)
     1. [License](#3-1)
     2. [Support](#3-2)
@@ -783,7 +783,7 @@ This is discussed: [https://github.com/Exiv2/exiv2/issues/1230](https://github.c
 
 <div id="2-19">
 
-2.19 Support for bmff files (CR3, HEIF and AVIF)
+2.19 Support for bmff files (CR3, HEIF, HEIC, and AVIF)
 
 **Attention is drawn to the possibility that bmff support may be the subject of patent rights. _Exiv2 shall not be held responsible for identifying any or all such patent rights.  Exiv2 shall not be held responsible for the legal consequences of the use of this code_.**
 
@@ -1336,5 +1336,5 @@ $ sudo pkg install developer/gcc-7
 
 [TOC](#TOC)
 
-Written by Robin Mills<br>robin@clanmills.com<br>Updated: 2021-03-05
+Written by Robin Mills<br>robin@clanmills.com<br>Updated: 2021-03-10
 
diff --git a/cmake/generateConfigFile.cmake b/cmake/generateConfigFile.cmake
index fe1cabbd..3f797531 100644
--- a/cmake/generateConfigFile.cmake
+++ b/cmake/generateConfigFile.cmake
@@ -7,7 +7,7 @@ if (${EXIV2_ENABLE_WEBREADY})
     set(EXV_USE_SSH   ${EXIV2_ENABLE_SSH})
     set(EXV_USE_CURL  ${EXIV2_ENABLE_CURL})
 endif()
-set(EXV_ENABLE_BMFF   ${EXIV2_ENABLE_BMFF})
+set(EXV_ENABLE_BMFF      ${EXIV2_ENABLE_BMFF})
 set(EXV_ENABLE_VIDEO     ${EXIV2_ENABLE_VIDEO})
 set(EXV_ENABLE_WEBREADY  ${EXIV2_ENABLE_WEBREADY})
 set(EXV_HAVE_LENSDATA    ${EXIV2_ENABLE_LENSDATA})
diff --git a/man/man1/exiv2.1 b/man/man1/exiv2.1
index c8b382de..b02a671b 100644
--- a/man/man1/exiv2.1
+++ b/man/man1/exiv2.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "Mar 8, 2021"
+.TH EXIV2 1 "Mar 10, 2021"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -49,6 +49,7 @@ DNG	Read/Write	Read/Write	Read/Write	-	Read/Write
 EPS	-	-	Read/Write	-	-
 EXV	Read/Write	Read/Write	Read/Write	Read/Write Read/Write
 GIF	-	-	-	-	-
+HEIC	Read	Read	Read	-	-
 HEIF	Read	Read	Read	-	-
 JP2	Read/Write	Read/Write	Read/Write	-	Read/Write
 JPEG	Read/Write	Read/Write	Read/Write	Read/Write	Read/Write
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index 1ec511ae..bd3ebcb9 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -134,6 +134,7 @@ namespace Exiv2
             case TAG_avif:
                 return "image/avif";
             case TAG_heic:
+                return "image/heic";
             case TAG_heif:
                 return "image/heif";
             case TAG_crx: