diff --git a/ChangeLog b/ChangeLog
index 991e2743..195071bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14532,3 +14532,6 @@
 	code for music events.
 	* Added an 'EVENTS.HAVE_CODE2' field to the database.
 	* Incremented the database version to 241.
+2014-10-08 Fred Gleason <fredg@paravelsystems.com>
+	* Applied a patch from albanpeignier that fixed a random/null
+	end point with FLAC imports [GitHub pull request #000034].
diff --git a/lib/rdwavefile.cpp b/lib/rdwavefile.cpp
index c09f9985..cf18a5cd 100644
--- a/lib/rdwavefile.cpp
+++ b/lib/rdwavefile.cpp
@@ -3759,6 +3759,8 @@ bool RDWaveFile::GetFlacStreamInfo()
   bits_per_sample=sinfo.data.stream_info.bits_per_sample;
   sample_length=sinfo.data.stream_info.total_samples;
   channels=sinfo.data.stream_info.channels;
+  ext_time_length=(unsigned)(1000.0*(double)sample_length/(double)samples_per_sec);
+  time_length=ext_time_length/1000;
   return true;
 #else
   return false;