diff --git a/ChangeLog b/ChangeLog
index 316cef7e14..240225fe69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2006-06-29	Javier Serrano Polo <jasp00/at/terra/dot/es>
+
+	* Makefile.am:
+	* include/automation_editor.h:
+	* include/automation_pattern.h:
+	* include/engine.h:
+	* include/main_window.h:
+	* include/song_editor.h:
+	* include/time_pattern.h:
+	* include/time_roll.h:
+	* include/track.h:
+	* src/lmms_single_source.cpp:
+	* src/core/automation_editor.cpp:
+	* src/core/engine.cpp:
+	* src/core/main_window.cpp:
+	* src/core/time_roll.cpp:
+	* src/core/track.cpp:
+	* src/tracks/automation_pattern.cpp:
+	* src/tracks/instrument_track.cpp:
+	* src/tracks/sample_track.cpp:
+	* src/tracks/time_pattern.cpp:
+	* src/widgets/knob.cpp:
+	renamed time* classes to automation* ones
+
+	* include/automatable_object.h:
+	- renamed time* classes to automation* ones
+	- fixed int classes rounding
+
+	* plugins/organic/organic.cpp:
+	save harmonic settings like before
+
+	* data/presets/Organic/organ_risingsun.cs.xml:
+	* data/presets/Organic/organ_swish.cs.xml:
+	* data/presets/Organic/pad_ethereal.cs.xml:
+	* data/presets/Organic/pad_rich.cs.xml:
+	* data/presets/Organic/pad_sweep.cs.xml:
+	* data/presets/Organic/sequencer_64.cs.xml:
+	upgraded to new detuning algorithm
+
 2006-06-28	Javier Serrano Polo <jasp00/at/terra/dot/es>
 
 	* include/level_object.h:
diff --git a/configure.in b/configure.in
index b660d8f249..654a605f8d 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.1.4-cvs20060628, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060628)
+AC_INIT(lmms, 0.1.4-cvs20060629, tobydox/at/users/dot/sourceforge/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060629)
 
 AM_CONFIG_HEADER(config.h)