diff --git a/src/time_formats.am b/src/time_formats.am
index dfc11b33..b3dae9c8 100644
--- a/src/time_formats.am
+++ b/src/time_formats.am
@@ -42,6 +42,7 @@ TIME_FORMATS = \
     "%m/%e/%Y %l:%M:%S %p" \
     "%d/%b/%y %H:%M:%S" \
     "%m%d %H:%M:%S" \
+    "%Y%m%d.%H%M%S" \
     "%H:%M:%S" \
     "%M:%S" \
     "%m/%d %H:%M:%S" \
diff --git a/test/logfile_generic.3 b/test/logfile_generic.3
new file mode 100644
index 00000000..a883793a
--- /dev/null
+++ b/test/logfile_generic.3
@@ -0,0 +1,2 @@
+20120702.102240,672:DEBUG:foo bar baz
+20141008.165638,344:WARN:foo bar baz
diff --git a/test/test_logfile.sh b/test/test_logfile.sh
index 50d58814..41cc16c9 100644
--- a/test/test_logfile.sh
+++ b/test/test_logfile.sh
@@ -444,6 +444,13 @@ Jul 02 10:22:40 2012 -- 672
 Oct 08 16:56:38 2014 -- 344
 EOF
 
+run_test ./drive_logfile -t -f generic_log ${srcdir}/logfile_generic.3
+
+check_output "generic_log timestamp interpreted incorrectly?" <<EOF
+Jul 02 10:22:40 2012 -- 672
+Oct 08 16:56:38 2014 -- 344
+EOF
+
 run_test ./drive_logfile -v -f generic_log ${srcdir}/logfile_generic.0
 
 check_output "generic_log level interpreted incorrectly?" <<EOF