diff --git a/src/actions.cpp b/src/actions.cpp
index 901fd36c..bcea1b6e 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -775,14 +775,19 @@ namespace Action {
         Exiv2::ExifKey key("Exif.Photo.DateTimeOriginal");
         Exiv2::ExifData::iterator md = exifData.findKey(key);
         if (md == exifData.end()) {
-            std::cerr << _("Metadatum with key") << " `" << key << "' "
-                      << _("not found in the file") << " " << path << "\n";
+            key = Exiv2::ExifKey("Exif.Image.DateTime");
+            md = exifData.findKey(key);
+        }
+        if (md == exifData.end()) {
+            std::cerr << _("Neither tag") << " `Exif.Photo.DateTimeOriginal' "
+                      << _("nor") << " `Exif.Image.DateTime' "
+                      << _("found in the file") << " " << path << "\n";
             return 1;
         }
         std::string v = md->toString();
         if (v.length() == 0 || v[0] == ' ') {
-            std::cerr << _("Image file creation timestamp not set in the file") << " "
-                      << path << "\n";
+            std::cerr << _("Image file creation timestamp not set in the file")
+                      << " " << path << "\n";
             return 1;
         }
         struct tm tm;
diff --git a/src/exiv2.1 b/src/exiv2.1
index a8838c59..cf22e176 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -3,7 +3,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 "February 25th, 2007"
+.TH EXIV2 1 "June 3rd, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -65,8 +65,10 @@ files. Requires option \fB\-c\fP, \fB\-m\fP or \fB\-M\fP.
 .TP
 .B mv | rename
 Rename files and/or set file timestamps according to the Exif create
-timestamp. The filename format can be set with \fB\-r\fP \fIfmt\fP,
-timestamp options are \fB\-t\fP and \fB\-T\fP.
+timestamp. Uses the value of tag Exif.Photo.DateTimeOriginal or, if
+not present, Exif.Image.DateTime to determine the timestamp. The
+filename format can be set with \fB\-r\fP \fIfmt\fP, timestamp options
+are \fB\-t\fP and \fB\-T\fP.
 .TP
 .B fi | fixiso
 Copy the ISO setting from any of the proprietary Nikon makernote ISO