diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index 957d03671781eb862a54344b50ec2851b25b23ea..af7d27f9615522f7ad78b49451d4b8605dd55048 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -339,6 +339,7 @@ class JpegMeta
      * Set an EXIF field
      *
      * @author Sebastian Delmont <sdelmont@zonageek.com>
+     * @author Joe Lapp <joe.lapp@pobox.com>
      */
     function setExifField($field, $value)
     {
@@ -354,6 +355,13 @@ class JpegMeta
             $this->_info['exif'] = array();
         }
 
+        // make sure datetimes are in correct format
+        if(strlen($field) >= 8 && strtolower(substr($field, 0, 8)) == 'datetime') {
+            if(strlen($value) < 8 || $value{4} != ':' || $value{7} != ':') {
+                $value = date('Y:m:d H:i:s', strtotime($value));
+            }
+        }
+
         $this->_info['exif'][$field] = $value;
 
         return true;