diff --git a/apps/codecs/libspeex/COPYING b/apps/codecs/libspeex/COPYING
new file mode 100644
index 0000000000..3b6b579cf3
--- /dev/null
+++ b/apps/codecs/libspeex/COPYING
@@ -0,0 +1,34 @@
+Copyright 2002-2006 
+        Xiph.org Foundation
+        Jean-Marc Valin
+        David Rowe
+        EpicGames
+        Analog Devices
+        Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/apps/codecs/libspeex/README.rockbox b/apps/codecs/libspeex/README.rockbox
new file mode 100644
index 0000000000..4280df4f02
--- /dev/null
+++ b/apps/codecs/libspeex/README.rockbox
@@ -0,0 +1,28 @@
+Library: libspeex-1.2beta1 (SVN version 12449)
+Imported: 2007-02-10 by Dan Everton
+
+
+This directory contains a local version of libspeex for decoding Ogg/Speex
+audio streams. 
+
+
+LICENSING INFORMATION
+
+Speex is available under the terms of the Xiph.Org variant of the BSD
+license, which is both an open source and free software license. The
+license is described in the COPYING file in this directory.
+
+
+IMPORT DETAILS
+
+The .[ch] files from speex/libspeex/ and speex/include/ were imported 
+into Rockbox.  This includes the test files.
+
+A simple config.h file was added to enable libspeex's fixed-point
+integer-only mode and to specify the endianness of the target CPU. Also,
+ARM specific optimisations were enabled.
+
+Since some parts of Speex still rely on <math.h> functions, a simple 
+include was created to get these parts to compile. Stub functions can be
+found in rockbox.c in this directory.
+
diff --git a/apps/codecs/libspeex/rockbox.c b/apps/codecs/libspeex/rockbox.c
index 231a6b8f18..ace2dfb63f 100644
--- a/apps/codecs/libspeex/rockbox.c
+++ b/apps/codecs/libspeex/rockbox.c
@@ -93,29 +93,37 @@ float floor(float x) {
 
 //Placeholders (not fixed point, only used when encoding):
 float pow(float a, float b) {
-	return 0;
+    DEBUGF("pow(%f, %f)\n", a, b);
+    return 0;
 }
 
 float log(float l) {
-	return 0;
+    DEBUGF("log(%f)\n", l);
+    return 0;
 }
 
 float fabs(float a) {
-	return 0;
+    DEBUGF("fabs(%f)\n", a);
+    return 0;
 }
 
 float sin(float a) {
-	return 0;
+    DEBUGF("sin(%f)\n", a);
+    return 0;
 }
 
 float cos(float a) {
-	return 0;
+    DEBUGF("cos(%f)\n", a);
+    return 0;
 }
 
 float sqrt(float a) {
-	return 0;
+    DEBUGF("sqrt(%f)\n", a);
+    return 0;
 }
 
 float exp(float a) {
-	return 0;
+    DEBUGF("exp(%f)\n", a);
+    return 0;
 }
+