diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 12dbc98718f..d1513811f07 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2011/01/15 20:57:09 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2011/11/14 16:52:38 naddy Exp $
 
 COMMENT=	Ogg bitstream library
 
-DISTNAME=	libogg-1.2.2
+DISTNAME=	libogg-1.3.0
 CATEGORIES=    	audio
 HOMEPAGE=	http://www.xiph.org/ogg/
-SHARED_LIBS +=	ogg                  6.1      # .7.1
+SHARED_LIBS=	ogg	6.2	# 8.0
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index 40c870a811b..7b9bf00b128 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1,5 +1,5 @@
-MD5 (libogg-1.2.2.tar.gz) = Wp/KvJobfG8c113cePNsVg==
-RMD160 (libogg-1.2.2.tar.gz) = ccQsG4lNJ291DDtdx1/vg0cgKms=
-SHA1 (libogg-1.2.2.tar.gz) = 3usZWfhN6Sd+dLyhfsZvogztnwg=
-SHA256 (libogg-1.2.2.tar.gz) = qwAFdLwm1fAShPWw9Q4S3HYdA1xCny6ccMsqlIfYz7o=
-SIZE (libogg-1.2.2.tar.gz) = 411540
+MD5 (libogg-1.3.0.tar.gz) = Cn60C4asBQ2zp4mrZf4hwg==
+RMD160 (libogg-1.3.0.tar.gz) = FD+hY57iF1pmCfMih0FNayPe6m8=
+SHA1 (libogg-1.3.0.tar.gz) = qQCvIbbX2xx6p06ww5WJ7Z25kbg=
+SHA256 (libogg-1.3.0.tar.gz) = qN6AdjEBRhVUnSNW/TZkGDO4KIIhzqIU+KcnUO/pN4A=
+SIZE (libogg-1.3.0.tar.gz) = 425144
diff --git a/audio/libogg/patches/patch-configure b/audio/libogg/patches/patch-configure
index bd876dbd24a..1e823b22a44 100644
--- a/audio/libogg/patches/patch-configure
+++ b/audio/libogg/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.11 2011/01/15 20:57:09 naddy Exp $
---- configure.orig	Tue Dec  7 11:04:03 2010
-+++ configure	Sat Jan 15 21:41:36 2011
-@@ -10777,7 +10777,7 @@ if test -z "$GCC"; then
+$OpenBSD: patch-configure,v 1.12 2011/11/14 16:52:38 naddy Exp $
+--- configure.orig	Thu Aug  4 19:36:57 2011
++++ configure	Mon Nov 14 17:37:56 2011
+@@ -11557,7 +11557,7 @@ if test -z "$GCC"; then
  		;;
          *)
                  DEBUG="-g"
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.11 2011/01/15 20:57:09 naddy Exp $
                  PROFILE="-g -p"
  		;;
          esac
-@@ -10800,8 +10800,8 @@ else
+@@ -11580,8 +11580,8 @@ else
  		;;
          *)
                  DEBUG="-g -Wall -fsigned-char"
diff --git a/audio/libogg/patches/patch-doc_Makefile_in b/audio/libogg/patches/patch-doc_Makefile_in
index ff9e660306a..91fb400532b 100644
--- a/audio/libogg/patches/patch-doc_Makefile_in
+++ b/audio/libogg/patches/patch-doc_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.9 2011/01/15 20:57:09 naddy Exp $
---- doc/Makefile.in.orig	Tue Dec  7 11:32:41 2010
-+++ doc/Makefile.in	Sat Jan 15 21:41:36 2011
-@@ -205,7 +205,7 @@ build_vendor = @build_vendor@
+$OpenBSD: patch-doc_Makefile_in,v 1.10 2011/11/14 16:52:38 naddy Exp $
+--- doc/Makefile.in.orig	Thu Aug  4 19:37:26 2011
++++ doc/Makefile.in	Mon Nov 14 17:37:56 2011
+@@ -208,7 +208,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
diff --git a/audio/libogg/patches/patch-doc_libogg_Makefile_in b/audio/libogg/patches/patch-doc_libogg_Makefile_in
index 333a5d4300b..9fc98aa3132 100644
--- a/audio/libogg/patches/patch-doc_libogg_Makefile_in
+++ b/audio/libogg/patches/patch-doc_libogg_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_libogg_Makefile_in,v 1.5 2011/01/15 20:57:09 naddy Exp $
---- doc/libogg/Makefile.in.orig	Tue Dec  7 11:32:41 2010
-+++ doc/libogg/Makefile.in	Sat Jan 15 21:41:36 2011
-@@ -165,7 +165,7 @@ build_vendor = @build_vendor@
+$OpenBSD: patch-doc_libogg_Makefile_in,v 1.6 2011/11/14 16:52:38 naddy Exp $
+--- doc/libogg/Makefile.in.orig	Thu Aug  4 19:37:26 2011
++++ doc/libogg/Makefile.in	Mon Nov 14 17:37:56 2011
+@@ -168,7 +168,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@