diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile
new file mode 100644
index 00000000000..ea5a737ab4b
--- /dev/null
+++ b/audio/xmms-wavpack/Makefile
@@ -0,0 +1,33 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/01/12 16:41:37 naddy Exp $
+
+SHARED_ONLY=	Yes
+
+COMMENT=	XMMS input plugin for playing WavPack files
+
+DISTNAME=	xmms-wavpack-1.0.2
+CATEGORIES=	audio
+HOMEPAGE=	http://www.wavpack.com/
+
+PERMIT_PACKAGE_CDROM=	"no license"
+PERMIT_PACKAGE_FTP=	"no license"
+PERMIT_DISTFILES_CDROM=	"no license"
+PERMIT_DISTFILES_FTP=	"no license"
+
+MASTER_SITES=	${HOMEPAGE}
+EXTRACT_SUFX=	.tar.bz2
+
+WANTLIB=	X11 Xau Xdmcp Xext Xi gdk glib gmodule gtk iconv \
+		intl m
+
+LIB_DEPENDS=	wavpack.>=0::audio/wavpack \
+		xmms.>=4::audio/xmms,-main
+
+USE_X11=	Yes
+USE_LIBTOOL=	Yes
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
+LIBTOOL_FLAGS=	--tag=disable-static
+
+.include <bsd.port.mk>
diff --git a/audio/xmms-wavpack/distinfo b/audio/xmms-wavpack/distinfo
new file mode 100644
index 00000000000..886714e3040
--- /dev/null
+++ b/audio/xmms-wavpack/distinfo
@@ -0,0 +1,5 @@
+MD5 (xmms-wavpack-1.0.2.tar.bz2) = PieNKblgmBfLOi0KIBCNaQ==
+RMD160 (xmms-wavpack-1.0.2.tar.bz2) = YQvzJXxEMtMfRqiWf1G/Odueeu4=
+SHA1 (xmms-wavpack-1.0.2.tar.bz2) = pkCndgQmggCtS4sgQDNzzLCgR3E=
+SHA256 (xmms-wavpack-1.0.2.tar.bz2) = en0icSAoSTX3Nmx+G0lNCoTv13QGmbpUix79ZIVdBJ4=
+SIZE (xmms-wavpack-1.0.2.tar.bz2) = 233978
diff --git a/audio/xmms-wavpack/patches/patch-src_libwavpack_cpp b/audio/xmms-wavpack/patches/patch-src_libwavpack_cpp
new file mode 100644
index 00000000000..eb49ef977f3
--- /dev/null
+++ b/audio/xmms-wavpack/patches/patch-src_libwavpack_cpp
@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_libwavpack_cpp,v 1.1.1.1 2009/01/12 16:41:37 naddy Exp $
+--- src/libwavpack.cpp.orig	Fri May  2 07:15:31 2008
++++ src/libwavpack.cpp	Sun Jan 11 19:39:37 2009
+@@ -21,7 +21,7 @@ extern "C" {
+ #define M_LN10   2.3025850929940456840179914546843642
+ #endif
+ 
+-#define DBG(format, args...) fprintf(stderr, format, ## args)
++#define DBG(format, args...) //fprintf(stderr, format, ## args)
+ #define BUFFER_SIZE 256 // read buffer size, in samples
+ 
+ extern "C" InputPlugin * get_iplugin_info(void);
+@@ -148,7 +148,7 @@ class WavpackDecoder (public)
+         int tsamples = num_samples * num_channels;
+ 
+         if (!(WavpackGetMode (ctx) & MODE_FLOAT)) {
+-            float scaler = (float) (1.0 / ((unsigned int32_t) 1 << (bytes_per_sample * 8 - 1)));
++            float scaler = (float) (1.0 / ((uint32_t) 1 << (bytes_per_sample * 8 - 1)));
+             float *fptr = (float *) input;
+             int32_t *lptr = input;
+             int cnt = tsamples;
diff --git a/audio/xmms-wavpack/patches/patch-src_ui_cpp b/audio/xmms-wavpack/patches/patch-src_ui_cpp
new file mode 100644
index 00000000000..34f2a1fe15b
--- /dev/null
+++ b/audio/xmms-wavpack/patches/patch-src_ui_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_ui_cpp,v 1.1.1.1 2009/01/12 16:41:37 naddy Exp $
+--- src/ui.cpp.orig	Fri May  2 07:15:31 2008
++++ src/ui.cpp	Sun Jan 11 19:39:26 2009
+@@ -21,7 +21,7 @@ extern "C" {
+ #define M_LN10   2.3025850929940456840179914546843642
+ #endif
+ 
+-#define DBG(format, args...) fprintf(stderr, format, ## args)
++#define DBG(format, args...) //fprintf(stderr, format, ## args)
+ 
+ void load_tag(ape_tag *tag, WavpackContext *ctx);
+ void update_tag(ape_tag *tag, char *filename);
diff --git a/audio/xmms-wavpack/pkg/DESCR b/audio/xmms-wavpack/pkg/DESCR
new file mode 100644
index 00000000000..196fb9aa708
--- /dev/null
+++ b/audio/xmms-wavpack/pkg/DESCR
@@ -0,0 +1,3 @@
+xmms-wavpack is a plugin for the multimedia player XMMS that plays
+audio files in the WavPack format, which supports lossless and lossy
+compression.
diff --git a/audio/xmms-wavpack/pkg/PLIST b/audio/xmms-wavpack/pkg/PLIST
new file mode 100644
index 00000000000..c9cb1f3def7
--- /dev/null
+++ b/audio/xmms-wavpack/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/12 16:41:37 naddy Exp $
+@comment lib/xmms/Input/libwavpack.la
+lib/xmms/Input/libwavpack.so