diff --git a/CREDITS b/CREDITS
index 7f7ed249d8..e19ae75069 100755
--- a/CREDITS
+++ b/CREDITS
@@ -9,6 +9,12 @@ GFS - for supporting ALSA development
 
 Telesthetic - for supporting SIP development
 
+Christos Ricudis - for substantial code contributions
+
+=== WISHLIST CONTRIBUTERS ===
+Jeremy McNamera - SpeeX support
+
+
 === HARDWARE DONORS === 
 * Thanks to QuickNet Technologies for their donation of an Internet
 PhoneJack and Linejack card to the project.  (http://www.quicknet.net)
diff --git a/codecs/Makefile b/codecs/Makefile
index 39aa85ec18..bfe6b7cf6f 100755
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -19,7 +19,7 @@
 #MODG723=codec_g723_1.so codec_g723_1b.so
 MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
-
+MODSPEEX=$(shell [ -f /usr/include/speex.h ] && echo "codec_speex.so")
 CFLAGS+=
 
 LIBG723=g723.1/libg723.a
@@ -29,8 +29,9 @@ LIBGSM=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; else echo "
 LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
 LIBMP3=mp3/libmp3.a
 LIBLPC10=lpc10/liblpc10.a
+LIBSPEEX=-lspeex -lm
 
-CODECS+=$(MODG723) codec_gsm.so codec_mp3_d.so codec_lpc10.so  \
+CODECS+=$(MODG723) $(MODSPEEX) codec_gsm.so codec_mp3_d.so codec_lpc10.so  \
         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
 
 all: $(CODECS)
@@ -70,6 +71,9 @@ codec_g723_1b.so : codec_g723_1b.o $(LIBG723B)
 codec_gsm.so: codec_gsm.o $(LIBGSMT) 
 	$(CC) -shared -Xlinker -x -o $@ $< $(LIBGSM)
 
+codec_speex.so: codec_speex.o
+	$(CC) -shared -Xlinker -x -o $@ $< $(LIBSPEEX)
+
 codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
 	$(CC) -shared -Xlinker -x -o $@ $< $(LIBLPC10) -lm
 
diff --git a/codecs/slin_speex_ex.h b/codecs/slin_speex_ex.h
new file mode 100755
index 0000000000..6b29f7e147
--- /dev/null
+++ b/codecs/slin_speex_ex.h
@@ -0,0 +1,28 @@
+/*
+  * Signed 16-bit audio data
+  *
+  * Source: speex.example
+  *
+  * Copyright (C) 1999, Mark Spencer
+  *
+  * Distributed under the terms of the GNU General Public License
+  *
+  */
+
+static signed short slin_speex_ex[] = {
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 0xfff8, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 0x0008, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+0x0008, 000000, 000000, 000000, 0xfff8, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 000000, 
+000000, 000000, 000000, 000000, 000000, 000000, 0x0008, 000000, 000000, 000000 };