diff --git a/Readme.md b/Readme.md
index 990dfee..6d0b189 100644
--- a/Readme.md
+++ b/Readme.md
@@ -219,7 +219,7 @@ When I organize photos I look at the embedded metadata. Here are the details of
 
 | Dimension | Fields | Notes |
 |---|---|---|
-| Date Taken (photo) | EXIF:DateTimeOriginal,EXIF:DateTime, EXIF:DateTimeDigitized, file created, file modified |   |
+| Date Taken (photo) | EXIF:DateTimeOriginal, EXIF:CreateDate, EXIF:ModifyDate, file created, file modified |   |
 | Date Taken (video, audio) | QuickTime:CreationDate, QuickTime:CreationDate-und-US, QuickTime:MediaCreateDate, file created, file modified |   |
 | Location (photo) | EXIF:GPSLatitude/EXIF:GPSLatitudeRef, EXIF:GPSLongitude/EXIF:GPSLongitudeRef  |   |
 | Location (video, audio) | XMP:GPSLatitude, Composite:GPSLatitude, XMP:GPSLongitude, Composite:GPSLongitude | Composite tags are read-only |
diff --git a/elodie/media/media.py b/elodie/media/media.py
index c2a9813..b3bad78 100644
--- a/elodie/media/media.py
+++ b/elodie/media/media.py
@@ -35,8 +35,8 @@ class Media(Base):
         self.exif_map = {
             'date_taken': [
                 'EXIF:DateTimeOriginal',
-                'EXIF:DateTime',
-                'EXIF:DateTimeDigitized'
+                'EXIF:CreateDate',
+                'EXIF:ModifyDate'
             ]
         }
         self.album_keys = ['XMP-xmpDM:Album', 'XMP:Album']