diff --git a/devel/libaudiofile/Makefile b/devel/libaudiofile/Makefile
index f5ee00cfcf5..1a65784f57a 100644
--- a/devel/libaudiofile/Makefile
+++ b/devel/libaudiofile/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.36 2008/12/22 20:28:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.37 2009/01/12 16:15:03 jasper Exp $
 
 COMMENT=	SGI audiofile library clone
 
 DISTNAME=	audiofile-0.2.6
-PKGNAME=	lib${DISTNAME}p1
+PKGNAME=	lib${DISTNAME}p2
 SHARED_LIBS +=	audiofile            0.2      # .0.2
 CATEGORIES=	devel audio
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/audiofile/0.2/}
 
 HOMEPAGE=	http://www.68k.org/~michael/audiofile/
 
-# GPL/LGPL
+# GPLv2/LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/devel/libaudiofile/patches/patch-libaudiofile_modules_msadpcm_c b/devel/libaudiofile/patches/patch-libaudiofile_modules_msadpcm_c
new file mode 100644
index 00000000000..5b00e912cbd
--- /dev/null
+++ b/devel/libaudiofile/patches/patch-libaudiofile_modules_msadpcm_c
@@ -0,0 +1,27 @@
+$OpenBSD: patch-libaudiofile_modules_msadpcm_c,v 1.1 2009/01/12 16:15:03 jasper Exp $
+
+Security fix for CVE-2008-5824
+Patch taken from the Debian bug report, #510205. 
+
+--- libaudiofile/modules/msadpcm.c.orig	Mon Jan 12 17:05:16 2009
++++ libaudiofile/modules/msadpcm.c	Mon Jan 12 17:06:05 2009
+@@ -129,8 +129,7 @@ static int ms_adpcm_decode_block (ms_adpcm_data *msadp
+ 	ms_adpcm_state	*state[2];
+ 
+ 	/* Calculate the number of bytes needed for decoded data. */
+-	outputLength = msadpcm->samplesPerBlock * sizeof (int16_t) *
+-		msadpcm->track->f.channelCount;
++	outputLength = msadpcm->samplesPerBlock * sizeof (int16_t);
+ 
+ 	channelCount = msadpcm->track->f.channelCount;
+ 
+@@ -180,8 +179,7 @@ static int ms_adpcm_decode_block (ms_adpcm_data *msadp
+ 		The first two samples have already been 'decoded' in
+ 		the block header.
+ 	*/
+-	samplesRemaining = (msadpcm->samplesPerBlock - 2) *
+-		msadpcm->track->f.channelCount;
++	samplesRemaining = msadpcm->samplesPerBlock - 2;
+ 
+ 	while (samplesRemaining > 0)
+ 	{
diff --git a/devel/libaudiofile/pkg/PLIST b/devel/libaudiofile/pkg/PLIST
index 5a3aba9778f..9dfa1c14064 100644
--- a/devel/libaudiofile/pkg/PLIST
+++ b/devel/libaudiofile/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.9 2004/08/09 13:28:31 espie Exp $
+@comment $OpenBSD: PLIST,v 1.10 2009/01/12 16:15:03 jasper Exp $
 bin/audiofile-config
-bin/sfconvert
-bin/sfinfo
+@bin bin/sfconvert
+@bin bin/sfinfo
 include/af_vfs.h
 include/audiofile.h
 include/aupvlist.h