diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index 20abb1b513..ac2b8bae11 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -16,7 +16,7 @@ ifdef APPEXTRA
    INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
 endif
 
-OUTPUT = $(OBJDIR)/libmad.a $(OBJDIR)/liba52.a $(OBJDIR)/libFLAC.a $(OBJDIR)/libTremor.a
+OUTPUT = $(OBJDIR)/libmad.a $(OBJDIR)/liba52.a $(OBJDIR)/libFLAC.a $(OBJDIR)/libTremor.a $(OBJDIR)/libwavpack.a
 
 all: $(OUTPUT)
 
@@ -42,10 +42,16 @@ $(OBJDIR)/libTremor.a:
 	@mkdir -p $(OBJDIR)/Tremor
 	@$(MAKE) -C Tremor TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE}
 
+$(OBJDIR)/libwavpack.a:
+	@echo "MAKE in libwavpack"
+	@mkdir -p $(OBJDIR)/libwavpack
+	@$(MAKE) -C libwavpack TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE}
+		
 clean:
 	@echo "cleaning codecs"
-	@rm -fr $(OBJDIR)/libmad $(OBJDIR)/liba52 $(OBJDIR)/libFLAC $(OBJDIR)/Tremor
+	@rm -fr $(OBJDIR)/libmad $(OBJDIR)/liba52 $(OBJDIR)/libFLAC $(OBJDIR)/Tremor $(OBJDIR)/libwavpack.a
 	@$(MAKE) -C libmad clean
 	@$(MAKE) -C liba52 clean
 	@$(MAKE) -C libFLAC clean
 	@$(MAKE) -C Tremor clean
+	@$(MAKE) -C libwavpack clean
\ No newline at end of file
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile
new file mode 100644
index 0000000000..ea11a73edf
--- /dev/null
+++ b/apps/codecs/libwavpack/Makefile
@@ -0,0 +1,43 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+
+INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export	\
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers
+
+ifdef APPEXTRA
+INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
+endif
+
+CFLAGS = $(GCCOPTS) \
+$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
+
+SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - )
+SOURCES = $(SRC)
+OBJS := $(SRC:%.c=$(OBJDIR)/libwavpack/%.o)
+DEPFILE = $(OBJDIR)/dep-libwavpack
+DIRS = 
+
+OUTPUT = $(OBJDIR)/libwavpack.a
+
+all: $(OUTPUT)
+
+$(OUTPUT): $(OBJS)
+	@echo "AR $@"
+	@$(AR) ruv $@ $+ >/dev/null 2>&1
+
+$(OBJDIR)/libwavpack/%.o: $(APPSDIR)/codecs/libwavpack/%.c
+	@$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libwavpack/ $< -o $@
+
+include $(TOOLSDIR)/make.inc
+
+clean:
+	@echo "cleaning libwavpack"
+	@rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
+
+-include $(DEPFILE)