diff --git a/index.html b/index.html
index 3ea31100..0b421693 100644
--- a/index.html
+++ b/index.html
@@ -2149,6 +2149,11 @@ aptitude -t squeeze-backports install cmake yasm</pre>
         <td id="w32api-version">3.17</td>
         <td id="w32api-website"><a href="http://www.mingw.org/">MinGW Windows API</a></td>
     </tr>
+    <tr>
+        <td id="wavpack-package">wavpack</td>
+        <td id="wavpack-version">4.60.1</td>
+        <td id="wavpack-website"><a href="http://www.wavpack.com/">WavPack</a></td>
+    </tr>
     <tr>
         <td id="wget-package">wget</td>
         <td id="wget-version">1.14</td>
diff --git a/src/sox.mk b/src/sox.mk
index 67ac0802..d96242dd 100644
--- a/src/sox.mk
+++ b/src/sox.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 71f05afc51e3d9b03376b2f98fd452d3a274d595
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc ffmpeg flac lame libgomp libmad libsndfile vorbis
+$(PKG)_DEPS     := gcc flac lame libgomp libmad libsndfile vorbis wavpack
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/sox/files/sox/' | \
@@ -27,7 +27,22 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --build="`config.guess`" \
-        --disable-shared
+        --disable-shared --enable-static \
+        --disable-debug \
+        --without-magic \
+        --without-png \
+        --without-ladspa \
+        --without-amrwb --without-amrnb \
+        --without-ffmpeg \
+        --with-flac \
+        --with-oggvorbis \
+        --with-sndfile \
+        --with-wavpack \
+        --with-mad \
+        --without-id3tag \
+        --with-lame \
+        --with-waveaudio --without-alsa --without-ao --without-coreaudio \
+        --without-oss --without-pulseaudio --without-sndio --without-sunaudio
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= EXTRA_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install
diff --git a/src/wavpack.mk b/src/wavpack.mk
new file mode 100644
index 00000000..5ff241b9
--- /dev/null
+++ b/src/wavpack.mk
@@ -0,0 +1,28 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := wavpack
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 003c65cb4e29c55011cf8e7b10d69120df5e7f30
+$(PKG)_SUBDIR   := wavpack-$($(PKG)_VERSION)
+$(PKG)_FILE     := wavpack-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://www.wavpack.com/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://www.wavpack.com/downloads.html' | \
+    grep '<a href="wavpack-.*\.tar\.bz2">' | \
+    head -n 1 | \
+    $(SED) -e 's/^.*<a href="wavpack-\([0-9.]*\)\.tar\.bz2">.*$/\1/'
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --without-iconv \
+        CFLAGS="-DWIN32"
+    $(MAKE) -C '$(1)' -j '$(JOBS)' SUBDIRS="src include"
+    $(MAKE) -C '$(1)' -j 1 install SUBDIRS="src include"
+endef
diff --git a/src/xine-lib-2-wavpack-alloca.patch b/src/xine-lib-2-wavpack-alloca.patch
new file mode 100644
index 00000000..007c6b15
--- /dev/null
+++ b/src/xine-lib-2-wavpack-alloca.patch
@@ -0,0 +1,23 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from:
+https://bugs.xine-project.org/show_bug.cgi?id=494
+
+diff -urN xine-lib-1.1.21-orig/src/combined/decoder_wavpack.c xine-lib-1.1.21/src/combined/decoder_wavpack.c
+--- xine-lib-1.1.21-orig/src/combined/decoder_wavpack.c	2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.21/src/combined/decoder_wavpack.c	2013-03-03 17:43:00.000000000 +0100
+@@ -27,6 +27,13 @@
+ #define LOG_MODULE "decode_wavpack"
+ #define LOG_VERBOSE
+ 
++#ifdef HAVE_ALLOCA_H
++#include <alloca.h>
++#endif
++#ifdef HAVE_MALLOC_H
++#include <malloc.h>
++#endif
++
+ #include "xine_internal.h"
+ #include "attributes.h"
+ #include "bswap.h"
diff --git a/src/xine-lib.mk b/src/xine-lib.mk
index 1890c768..8880d6c4 100644
--- a/src/xine-lib.mk
+++ b/src/xine-lib.mk
@@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 0adf20ef55d24f2a1b4a8974e57ad1be5133b236
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis zlib
+$(PKG)_DEPS     := gcc faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis wavpack zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://hg.debian.org/hg/xine-lib/xine-lib/tags' | \
@@ -51,7 +51,7 @@ define $(PKG)_BUILD
         --with-internal-vcdlibs \
         --with-external-libfaad \
         --without-external-libdts \
-        --without-wavpack \
+        --with-wavpack \
         CFLAGS='-I$(1)/win32/include' \
         PTHREAD_LIBS='-lpthread -lws2_32' \
         LIBS="`$(TARGET)-pkg-config --libs libmng`"