diff --git a/ChangeLog b/ChangeLog
index dbb51a445..76ff2c819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2006-06-09	Javier Serrano Polo <jasp00/at/terra/dot/es>
+
+	* include/lmms_math.h:
+	* include/oscillator.h:
+	* include/sample_buffer.h:
+	* src/lib/oscillator.cpp:
+	- reverted to PM and added FM as a new modulation method
+	- improved performance, specially PM/FM
+	- moved fraction() to global scope
+	- removed absolute value from userWaveSample, it's handled by fraction()
+
+	* plugins/triple_oscillator/pm_active.png:
+	* plugins/triple_oscillator/pm_inactive.png:
+	* plugins/triple_oscillator/triple_oscillator.cpp:
+	added PM buttons, hid FM ones
+
+	* Makefile.am:
+	added lmms_math.h
+
+	* data/locale/ca.ts:
+	updated translation
+
 2006-06-05	Javier Serrano Polo <jasp00/at/terra/dot/es>
 
 	* include/oscillator.h:
diff --git a/configure.in b/configure.in
index 7f503dd38..fcdd1ec25 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-cvs20060605, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060605)
+AC_INIT(lmms, 0.1.4-cvs20060609, tobydox/at/users/dot/sourceforge/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060609)
 
 AM_CONFIG_HEADER(config.h)