diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index ceb209c97e7..9641baa4df2 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2004/11/21 17:51:45 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2005/01/30 17:12:02 naddy Exp $
 
 COMMENT=	"audio compression codec library"
 
 DISTNAME=	libvorbis-1.1.0
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=    	audio
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
 
diff --git a/audio/libvorbis/patches/patch-Makefile_in b/audio/libvorbis/patches/patch-Makefile_in
new file mode 100644
index 00000000000..d8bcbd96a94
--- /dev/null
+++ b/audio/libvorbis/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.5 2005/01/30 17:12:02 naddy Exp $
+--- Makefile.in.orig	Mon Jan 24 18:31:29 2005
++++ Makefile.in	Mon Jan 24 18:31:42 2005
+@@ -207,7 +207,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign dist-zip
+-SUBDIRS = lib include doc examples win32 debian vq
++SUBDIRS = lib include doc
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = vorbis.m4
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/audio/libvorbis/patches/patch-configure b/audio/libvorbis/patches/patch-configure
index 0f72131be25..74d21ad11fb 100644
--- a/audio/libvorbis/patches/patch-configure
+++ b/audio/libvorbis/patches/patch-configure
@@ -1,6 +1,18 @@
-$OpenBSD: patch-configure,v 1.7 2004/09/30 19:39:56 naddy Exp $
+$OpenBSD: patch-configure,v 1.8 2005/01/30 17:12:02 naddy Exp $
 --- configure.orig	Tue Sep 21 01:22:05 2004
-+++ configure	Thu Sep 23 20:23:14 2004
++++ configure	Mon Jan 24 18:06:12 2005
+@@ -2040,9 +2040,9 @@ fi
+ 
+ 
+ 
+-V_LIB_CURRENT=3
++V_LIB_CURRENT=4
+ V_LIB_REVISION=0
+-V_LIB_AGE=3
++V_LIB_AGE=0
+ VF_LIB_CURRENT=4
+ VF_LIB_REVISION=0
+ VF_LIB_AGE=1
 @@ -19245,7 +19245,7 @@ if test -z "$GCC"; then
  		PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
  	*)
diff --git a/audio/libvorbis/patches/patch-lib_Makefile_in b/audio/libvorbis/patches/patch-lib_Makefile_in
index ae81c9fa3dd..37b1abe0343 100644
--- a/audio/libvorbis/patches/patch-lib_Makefile_in
+++ b/audio/libvorbis/patches/patch-lib_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.2 2004/09/30 19:39:57 naddy Exp $
---- lib/Makefile.in.orig	Thu Sep 23 21:36:43 2004
-+++ lib/Makefile.in	Thu Sep 23 21:40:02 2004
+$OpenBSD: patch-lib_Makefile_in,v 1.3 2005/01/30 17:12:02 naddy Exp $
+--- lib/Makefile.in.orig	Tue Sep 21 01:22:04 2004
++++ lib/Makefile.in	Mon Jan 24 17:59:32 2005
 @@ -57,10 +57,10 @@ am_libvorbis_la_OBJECTS = mdct.lo smallf
  	info.lo floor1.lo floor0.lo res0.lo mapping0.lo registry.lo \
  	codebook.lo sharedbook.lo lookup.lo bitrate.lo
@@ -28,8 +28,9 @@ $OpenBSD: patch-lib_Makefile_in,v 1.2 2004/09/30 19:39:57 naddy Exp $
  			codec_internal.h backends.h bitrate.h 
  
 -libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+-libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@
 +libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
- libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@
++libvorbis_la_LIBADD = @VORBIS_LIBS@
  libvorbisfile_la_SOURCES = vorbisfile.c
 -libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
 -libvorbisfile_la_LIBADD = libvorbis.la
diff --git a/audio/libvorbis/pkg/PFRAG.shared b/audio/libvorbis/pkg/PFRAG.shared
index 50bfe34a8a5..3a20d7252ee 100644
--- a/audio/libvorbis/pkg/PFRAG.shared
+++ b/audio/libvorbis/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2004/08/06 14:37:27 espie Exp $
-@lib lib/libvorbis.so.3.0
+@comment $OpenBSD: PFRAG.shared,v 1.7 2005/01/30 17:12:03 naddy Exp $
+@lib lib/libvorbis.so.4.0
 @lib lib/libvorbisenc.so.2.0
 @lib lib/libvorbisfile.so.4.0