diff --git a/ChangeLog b/ChangeLog
index 51d47ff83..0cdadee9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-24	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/basic_ops.cpp:
+	fixed alignedMemCpyNoOpt
+
+	* src/core/audio/audio_alsa.cpp:
+	fixed pointer additions leading to horrible noises under certain
+	circumstances
+
 2008-11-23	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* src/core/basic_ops.cpp:
diff --git a/src/core/basic_ops.cpp b/src/core/basic_ops.cpp
index 90d14540c..5f54667e5 100644
--- a/src/core/basic_ops.cpp
+++ b/src/core/basic_ops.cpp
@@ -83,7 +83,7 @@ void alignedFreeFrames( sampleFrame * _buf )
 // slow fallback
 void alignedMemCpyNoOpt( void * RP _dst, const void * RP _src, int _size )
 {
-	const int s = _size / ( sizeof( int ) * 16 );
+	const int s = _size / sizeof( int );
 	const int * RP src = (const int *) _src;
 	int * RP dst = (int *) _dst;
 	for( int i = 0; i < s; )