diff --git a/src/exif-common.c b/src/exif-common.c
index 833a86cf..130b5024 100644
--- a/src/exif-common.c
+++ b/src/exif-common.c
@@ -226,7 +226,7 @@ static gchar *exif_build_formatted_DateTime(ExifData *exif)
 	memset(&tm, 0, sizeof(tm)); /* Uh, strptime could let garbage in tm! */
 	if (text && strptime(text, "%Y:%m:%d %H:%M:%S", &tm))
 		{
-		buflen = strftime(buf, sizeof(buf), "%x %X", &tm);
+		buflen = strftime(buf, sizeof(buf), "%F %X", &tm);
 		if (buflen > 0)
 			{
 			tmp = g_locale_to_utf8(buf, buflen, NULL, NULL, &error);
@@ -277,7 +277,7 @@ static gchar *exif_build_formatted_DateTimeDigitized(ExifData *exif)
 	memset(&tm, 0, sizeof(tm)); /* Uh, strptime could let garbage in tm! */
 	if (text && strptime(text, "%Y:%m:%d %H:%M:%S", &tm))
 		{
-		buflen = strftime(buf, sizeof(buf), "%x %X", &tm);
+		buflen = strftime(buf, sizeof(buf), "%F %X", &tm);
 		if (buflen > 0)
 			{
 			tmp = g_locale_to_utf8(buf, buflen, NULL, NULL, &error);
@@ -803,7 +803,7 @@ static gchar *exif_build_formatted_localtime(ExifData *exif)
 			tm_local = localtime(&stamp);
 
 			/* Convert to localtime using locale */
-			buflen = strftime(buf, sizeof(buf), "%x %X", tm_local);
+			buflen = strftime(buf, sizeof(buf), "%F %X", tm_local);
 			if (buflen > 0)
 				{
 				tmp = g_locale_to_utf8(buf, buflen, NULL, NULL, &error);
diff --git a/src/filedata.c b/src/filedata.c
index d89ea3b5..33d2e9c9 100644
--- a/src/filedata.c
+++ b/src/filedata.c
@@ -137,7 +137,7 @@ const gchar *text_from_time(time_t t)
 	btime = localtime(&t);
 
 	/* the %x warning about 2 digit years is not an error */
-	buflen = strftime(buf, sizeof(buf), "%x %X", btime);
+	buflen = strftime(buf, sizeof(buf), "%F %X", btime);
 	if (buflen < 1) return "";
 
 	g_free(ret);