diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 4f98b10e69..660675c4a5 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -35,4 +35,5 @@ source "package/multimedia/taglib/Config.in"
 source "package/multimedia/tremor/Config.in"
 source "package/multimedia/vlc/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
+source "package/multimedia/wavpack/Config.in"
 endmenu
diff --git a/package/multimedia/wavpack/Config.in b/package/multimedia/wavpack/Config.in
new file mode 100644
index 0000000000..1ef3e420da
--- /dev/null
+++ b/package/multimedia/wavpack/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_WAVPACK
+	bool "wavpack"
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  WavPack is a completely open audio compression format providing
+	  lossless, high-quality lossy, and a unique hybrid compression mode.
+
+	  http://www.wavpack.com/
diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk
new file mode 100644
index 0000000000..035963a573
--- /dev/null
+++ b/package/multimedia/wavpack/wavpack.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# wavpack
+#
+################################################################################
+
+WAVPACK_VERSION = 4.60.1
+WAVPACK_SITE = http://www.wavpack.com
+WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2
+WAVPACK_INSTALL_STAGING = YES
+
+ifneq ($(BR2_ENABLE_LOCALE),y)
+WAVPACK_DEPENDENCIES += libiconv
+endif
+
+$(eval $(call AUTOTARGETS,package/multimedia,wavpack))