diff --git a/ChangeLog b/ChangeLog
index 71fe52496..356100ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2006-08-06	Javier Serrano Polo <jasp00/at/terra/dot/es>
+
+	* include/engine.h:
+	* include/midi_time.h:
+	* src/core/engine.cpp:
+	* src/core/note_play_handle.cpp:
+	* src/tracks/bb_track.cpp:
+	* src/tracks/sample_track.cpp:
+	frames computation based on 64th of a tact, fixes BB-pattern arbitrary
+	positioning in song editor
+
+	* include/song_editor.h:
+	* src/core/song_editor.cpp:
+	- frames computation based on 64th of a tact
+	- changed playPos frame counter to float, improves timing precision
+
+	* src/tracks/instrument_track.cpp:
+	- frames computation based on 64th of a tact
+	- simplified note playing
+
 2006-08-03	Javier Serrano Polo <jasp00/at/terra/dot/es>
 
 	* src/core/automation_editor.cpp:
diff --git a/configure.in b/configure.in
index c87a2244f..989906aec 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.2.1-cvs20060803, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.1-cvs20060803)
+AC_INIT(lmms, 0.2.1-cvs20060806, tobydox/at/users/dot/sourceforge/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.2.1-cvs20060806)
 
 AM_CONFIG_HEADER(config.h)