diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 6920fea0908..954165a7cfb 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2008/01/04 17:48:33 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2008/03/25 21:24:24 naddy Exp $
 
 COMMENT=	library to handle various audio file formats
 
-DISTNAME=	libsndfile-1.0.11
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	libsndfile-1.0.17
 CATEGORIES=	audio
 HOMEPAGE=	http://www.mega-nerd.com/libsndfile/
-SHARED_LIBS +=	sndfile              1.11     # .1.11
+SHARED_LIBS +=	sndfile              2.0      # .1.17
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -22,7 +21,10 @@ WANTLIB=	c m
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED}
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--disable-alsa \
+		--disable-flac \
+		--disable-sqlite
 
 FAKE_FLAGS=	htmldocdir=${PREFIX}/share/doc/libsndfile
 
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index b5ecbd5fbed..2f0b8e1c2c3 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,5 +1,5 @@
-MD5 (libsndfile-1.0.11.tar.gz) = nsCzYQBBQjpXOH8oSEny/A==
-RMD160 (libsndfile-1.0.11.tar.gz) = OCnR+p9crxb0tYnQOHfSKcuPVgM=
-SHA1 (libsndfile-1.0.11.tar.gz) = FjcqeBRTAXiiZCvSLyA2QeA5Lrs=
-SHA256 (libsndfile-1.0.11.tar.gz) = /RB+eSPdCfSKLt4xuhHpllR42cPglNGcuBEkqXH/ns8=
-SIZE (libsndfile-1.0.11.tar.gz) = 816107
+MD5 (libsndfile-1.0.17.tar.gz) = LRJsNUSFA/bb4zk02Vgfaw==
+RMD160 (libsndfile-1.0.17.tar.gz) = rpOCKkxYfc3Xxw0EPSo47S/joYg=
+SHA1 (libsndfile-1.0.17.tar.gz) = L2Z5jVlqFUkfvRGR3tgSXtce9BE=
+SHA256 (libsndfile-1.0.17.tar.gz) = F5Lk5gOGtFDvjsB8dW6PPs/pbr2n0LCRSNpfQ20GXvI=
+SIZE (libsndfile-1.0.17.tar.gz) = 819456
diff --git a/audio/libsndfile/patches/patch-examples_sndfile-play_c b/audio/libsndfile/patches/patch-examples_sndfile-play_c
index dea87499e04..40f7e8272cb 100644
--- a/audio/libsndfile/patches/patch-examples_sndfile-play_c
+++ b/audio/libsndfile/patches/patch-examples_sndfile-play_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-examples_sndfile-play_c,v 1.2 2005/05/23 23:49:28 naddy Exp $
---- examples/sndfile-play.c.orig	Sun Nov 14 20:57:17 2004
-+++ examples/sndfile-play.c	Mon May 23 22:43:53 2005
+$OpenBSD: patch-examples_sndfile-play_c,v 1.3 2008/03/25 21:24:24 naddy Exp $
+--- examples/sndfile-play.c.orig	Thu Aug 31 05:22:07 2006
++++ examples/sndfile-play.c	Sat Jun  9 11:59:02 2007
 @@ -43,7 +43,7 @@
  	#include <Carbon.h>
  	#include <CoreAudio/AudioHardware.h>
@@ -10,7 +10,7 @@ $OpenBSD: patch-examples_sndfile-play_c,v 1.2 2005/05/23 23:49:28 naddy Exp $
  	#include <fcntl.h>
  	#include <sys/ioctl.h>
  	#include <sys/audioio.h>
-@@ -798,7 +798,7 @@ win32_play (int argc, char *argv [])
+@@ -819,7 +819,7 @@ win32_play (int argc, char *argv [])
  **	Solaris.
  */
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-examples_sndfile-play_c,v 1.2 2005/05/23 23:49:28 naddy Exp $
  
  static void
  solaris_play (int argc, char *argv [])
-@@ -835,8 +835,10 @@ solaris_play (int argc, char *argv [])
+@@ -856,8 +856,10 @@ solaris_play (int argc, char *argv [])
  		audio_info.play.channels = sfinfo.channels ;
  		audio_info.play.precision = 16 ;
  		audio_info.play.encoding = AUDIO_ENCODING_LINEAR ;
@@ -30,7 +30,7 @@ $OpenBSD: patch-examples_sndfile-play_c,v 1.2 2005/05/23 23:49:28 naddy Exp $
  
  		if ((error = ioctl (audio_fd, AUDIO_SETINFO, &audio_info)))
  		{	perror ("ioctl (AUDIO_SETINFO) failed") ;
-@@ -914,7 +916,7 @@ main (int argc, char *argv [])
+@@ -935,7 +937,7 @@ main (int argc, char *argv [])
  		linux_play (argc, argv) ;
  #elif (defined (__MACH__) && defined (__APPLE__))
  	macosx_play (argc, argv) ;
diff --git a/audio/libsndfile/pkg/PLIST b/audio/libsndfile/pkg/PLIST
index 5212f7a0491..4793be19321 100644
--- a/audio/libsndfile/pkg/PLIST
+++ b/audio/libsndfile/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/05/23 23:49:28 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2008/03/25 21:24:24 naddy Exp $
 bin/sndfile-convert
 bin/sndfile-info
 bin/sndfile-play
+@comment bin/sndfile-regtest
 include/sndfile.h
+include/sndfile.hh
 lib/libsndfile.a
 lib/libsndfile.la
 lib/pkgconfig/