diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 49bead7740f..3f7aabaec2d 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2009/07/14 15:45:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2010/06/03 15:47:42 naddy Exp $
 
 COMMENT=	Ogg bitstream library
 
-DISTNAME=	libogg-1.1.4
+DISTNAME=	libogg-1.2.0
 CATEGORIES=    	audio
 HOMEPAGE=	http://www.xiph.org/ogg/
-SHARED_LIBS +=	ogg                  6.0      # .6.0
+SHARED_LIBS +=	ogg                  6.0      # .7.0
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -22,7 +22,4 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED}
 SEPARATE_BUILD=	simple
 
-# required for MAKE_JOBS > 1
-MAKE_FLAGS=	MKDIR_P="mkdir -p"
-
 .include <bsd.port.mk>
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index b021198d97d..d36c6f9ce11 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1,5 +1,5 @@
-MD5 (libogg-1.1.4.tar.gz) = ECAOwiVDhB2dHCPgrtTl6Q==
-RMD160 (libogg-1.1.4.tar.gz) = Xq/D3vrmWLIRhQNtmnEfNGfmQl0=
-SHA1 (libogg-1.1.4.tar.gz) = horONyAEzzAyMblUxgqDasvXEGU=
-SHA256 (libogg-1.1.4.tar.gz) = k1TBg/2IQXwoYHeLYLeJbJSH2Pbli5/sP9v5cRQs4QM=
-SIZE (libogg-1.1.4.tar.gz) = 439365
+MD5 (libogg-1.2.0.tar.gz) = yVtzdZrPwwcSvu9s5OiO+g==
+RMD160 (libogg-1.2.0.tar.gz) = NbvtFlSwA6e3XcncqOMRrnPAMhA=
+SHA1 (libogg-1.2.0.tar.gz) = E1+4EiguCIMylckeAFvQJY//kJg=
+SHA256 (libogg-1.2.0.tar.gz) = 8w2YPiOKzZToCuVRMn6i+DzcMwRwtBiFZL7yj+xZ62k=
+SIZE (libogg-1.2.0.tar.gz) = 400293
diff --git a/audio/libogg/patches/patch-configure b/audio/libogg/patches/patch-configure
index 35b444e0afc..0d58c4a4118 100644
--- a/audio/libogg/patches/patch-configure
+++ b/audio/libogg/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.8 2009/07/13 15:47:55 naddy Exp $
---- configure.orig	Wed Jun 24 17:27:08 2009
-+++ configure	Sat Jul  4 23:05:25 2009
-@@ -19928,7 +19928,7 @@ if test -z "$GCC"; then
+$OpenBSD: patch-configure,v 1.9 2010/06/03 15:47:42 naddy Exp $
+--- configure.orig	Fri May 21 20:06:20 2010
++++ configure	Fri May 21 20:07:01 2010
+@@ -11082,7 +11082,7 @@ if test -z "$GCC"; then
  		;;
          *)
                  DEBUG="-g"
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2009/07/13 15:47:55 naddy Exp $
                  PROFILE="-g -p"
  		;;
          esac
-@@ -20002,8 +20002,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+@@ -11156,8 +11156,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
  		;;
          *)
                  DEBUG="-g -Wall -fsigned-char"
diff --git a/audio/libogg/patches/patch-doc_Makefile_in b/audio/libogg/patches/patch-doc_Makefile_in
index 2346d54a631..717a5a0edf9 100644
--- a/audio/libogg/patches/patch-doc_Makefile_in
+++ b/audio/libogg/patches/patch-doc_Makefile_in
@@ -1,8 +1,8 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.6 2009/07/13 15:47:55 naddy Exp $
---- doc/Makefile.in.orig	Sat Jul  4 23:04:39 2009
-+++ doc/Makefile.in	Sat Jul  4 23:04:54 2009
-@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
+$OpenBSD: patch-doc_Makefile_in,v 1.7 2010/06/03 15:47:42 naddy Exp $
+--- doc/Makefile.in.orig	Fri Mar 26 01:35:37 2010
++++ doc/Makefile.in	Fri May 21 20:07:24 2010
+@@ -156,7 +156,7 @@ build_os = @build_os@
+ build_vendor = @build_vendor@
  datadir = @datadir@
  datarootdir = @datarootdir@
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
diff --git a/audio/libogg/patches/patch-doc_libogg_Makefile_in b/audio/libogg/patches/patch-doc_libogg_Makefile_in
index c38002c2ecb..63ba762d873 100644
--- a/audio/libogg/patches/patch-doc_libogg_Makefile_in
+++ b/audio/libogg/patches/patch-doc_libogg_Makefile_in
@@ -1,8 +1,8 @@
-$OpenBSD: patch-doc_libogg_Makefile_in,v 1.2 2009/07/13 15:47:55 naddy Exp $
---- doc/libogg/Makefile.in.orig	Sat Jul  4 23:04:34 2009
-+++ doc/libogg/Makefile.in	Sat Jul  4 23:05:05 2009
-@@ -144,7 +144,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
+$OpenBSD: patch-doc_libogg_Makefile_in,v 1.3 2010/06/03 15:47:42 naddy Exp $
+--- doc/libogg/Makefile.in.orig	Fri Mar 26 01:35:37 2010
++++ doc/libogg/Makefile.in	Fri May 21 20:07:24 2010
+@@ -147,7 +147,7 @@ build_os = @build_os@
+ build_vendor = @build_vendor@
  datadir = @datadir@
  datarootdir = @datarootdir@
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg