diff --git a/ChangeLog b/ChangeLog
index 2d18e9fcd..c707315fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-10-15	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/timeline.cpp:
+	move position marker lines even if autoscrolling is disabled
+
+	* include/envelope_and_lfo_parameters.h:
+	* src/core/envelope_and_lfo_parameters.cpp:
+	reverted to rev. 1479 as the optimizations lately completely screwed
+	up things...
+
+	* plugins/flp_import/flp_import.cpp:
+	* include/basic_filters.h:
+	cleanups
+
 2008-10-14	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* tests/README:
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index 22f8c28da..0d634953f 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -184,10 +184,7 @@ void timeLine::updatePosition( const midiTime & )
 	{
 		m_posMarkerX = new_x;
 		m_changedPosition = TRUE;
-		if( m_autoScroll == AutoScrollEnabled )
-		{
-			emit positionChanged( m_pos );
-		}
+		emit positionChanged( m_pos );
 		update();
 	}
 }