diff --git a/ChangeLog b/ChangeLog
index 3ae0e9297..85c0ff25c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2006-08-10	Javier Serrano Polo <jasp00/at/terra/dot/es>
+
+	* include/bb_track.h:
+	* include/track.h:
+	* src/core/bb_editor.cpp:
+	added disabled tracks
+
+	* src/tracks/bb_track.cpp:
+	- added disabled tracks
+	- fixed BB-track 0 cloning bug
+
+	* src/core/track.cpp:
+	- added disabled tracks
+	- update track operations menu
+	- simplified engine access
+	- fixed BB-track 0 cloning bug
+	- improved removing automation patterns
+
+	* include/track_container.h:
+	- moved tracks() to public
+	- added node name
+
+	* src/core/track_container.cpp:
+	added node name
+
+	* data/themes/default/mute_on_disabled.png:
+	* data/themes/default/track_op_menu_disabled.png:
+	* data/themes/default/mute_off_disabled.png:
+	* resources/mute_on_disabled.png:
+	* resources/track_op_menu_disabled.png:
+	* resources/mute_off_disabled.png:
+	added disabled track artwork
+
 2006-08-10	Danny McRae <khjklujn/at/users/dot/sourceforge/dot/net>
 	* include/effect.h:
 	* include/effect_chain.h:
diff --git a/configure.in b/configure.in
index 67a80ef38..c1ae24c3d 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-cvs20060807, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.1-cvs20060807)
+AC_INIT(lmms, 0.2.1-cvs20060810, tobydox/at/users/dot/sourceforge/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.2.1-cvs20060810)
 
 AM_CONFIG_HEADER(config.h)