diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 35dd23a9925..19bea5da8f9 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2006/06/05 12:34:29 steven Exp $
+# $OpenBSD: Makefile,v 1.5 2006/07/21 11:24:07 steven Exp $
 
 COMMENT=	"open video codec"
-DISTNAME=	libtheora-1.0alpha6
+DISTNAME=	libtheora-1.0alpha7
 CATEGORIES=	multimedia
-SHARED_LIBS=	theora	1.1
+SHARED_LIBS=	theora	2.0
 
 MASTER_SITES=	http://downloads.xiph.org/releases/theora/
 
diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo
index 6d6807ca984..0e96d93bb76 100644
--- a/multimedia/libtheora/distinfo
+++ b/multimedia/libtheora/distinfo
@@ -1,4 +1,4 @@
-MD5 (libtheora-1.0alpha6.tar.gz) = 0309b6e6da4b3a5e5d27adfc8558a73d
-RMD160 (libtheora-1.0alpha6.tar.gz) = e03f232416f0c4160bd5034bb0bc7234020b6892
-SHA1 (libtheora-1.0alpha6.tar.gz) = 93ec6eaccc841581a723c251db06138fd9e783f4
-SIZE (libtheora-1.0alpha6.tar.gz) = 1863054
+MD5 (libtheora-1.0alpha7.tar.gz) = 55ee3c6db3e0927e7918309891a8f52b
+RMD160 (libtheora-1.0alpha7.tar.gz) = 12970c8d055b6042625a9f1fc634c4370827116a
+SHA1 (libtheora-1.0alpha7.tar.gz) = 839dbb7ef0cb1c3fbfcf788dcecf9e7550427491
+SIZE (libtheora-1.0alpha7.tar.gz) = 2002542
diff --git a/multimedia/libtheora/patches/patch-doc_Makefile_in b/multimedia/libtheora/patches/patch-doc_Makefile_in
index 802dfa79a99..377464af07d 100644
--- a/multimedia/libtheora/patches/patch-doc_Makefile_in
+++ b/multimedia/libtheora/patches/patch-doc_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1 2006/06/05 12:34:29 steven Exp $
---- doc/Makefile.in.orig	Fri Jun  2 17:26:19 2006
-+++ doc/Makefile.in	Fri Jun  2 17:26:28 2006
-@@ -120,7 +120,7 @@ install_sh = @install_sh@
- 
+$OpenBSD: patch-doc_Makefile_in,v 1.2 2006/07/21 11:24:07 steven Exp $
+--- doc/Makefile.in.orig	Wed Jun 28 23:08:22 2006
++++ doc/Makefile.in	Wed Jun 28 23:08:34 2006
+@@ -215,7 +215,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  SUBDIRS = #python
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- 
  built_docs = 
- 
+ static_docs = vp3-format.txt color.html \
+ 	draft-barbato-avt-rtp-theora-01.xml \
diff --git a/multimedia/libtheora/patches/patch-examples_Makefile_in b/multimedia/libtheora/patches/patch-examples_Makefile_in
index 1ae96a07f7d..3c641088738 100644
--- a/multimedia/libtheora/patches/patch-examples_Makefile_in
+++ b/multimedia/libtheora/patches/patch-examples_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-examples_Makefile_in,v 1.1 2006/06/05 12:34:29 steven Exp $
---- examples/Makefile.in.orig	Fri Jun  2 17:26:42 2006
-+++ examples/Makefile.in	Fri Jun  2 17:27:11 2006
-@@ -216,7 +216,7 @@ encoder_example$(EXEEXT): $(encoder_exam
- player_example-player_example.$(OBJEXT): player_example.c
+$OpenBSD: patch-examples_Makefile_in,v 1.2 2006/07/21 11:24:07 steven Exp $
+--- examples/Makefile.in.orig	Tue Jun 20 15:06:55 2006
++++ examples/Makefile.in	Wed Jun 28 23:06:56 2006
+@@ -290,7 +290,7 @@ encoder_example$(EXEEXT): $(encoder_exam
+ 	$(LINK) $(encoder_example_LDFLAGS) $(encoder_example_OBJECTS) $(encoder_example_LDADD) $(LIBS)
  player_example$(EXEEXT): $(player_example_OBJECTS) $(player_example_DEPENDENCIES) 
  	@rm -f player_example$(EXEEXT)
 -	$(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) $(player_example_LDADD) $(LIBS)
 +#	$(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) $(player_example_LDADD) $(LIBS)
  
  mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
+ 	-rm -f *.$(OBJEXT)
diff --git a/multimedia/libtheora/patches/patch-examples_dump_video_c b/multimedia/libtheora/patches/patch-examples_dump_video_c
new file mode 100644
index 00000000000..8b84650647b
--- /dev/null
+++ b/multimedia/libtheora/patches/patch-examples_dump_video_c
@@ -0,0 +1,21 @@
+$OpenBSD: patch-examples_dump_video_c,v 1.1 2006/07/21 11:24:07 steven Exp $
+--- examples/dump_video.c.orig	Fri Jul 21 12:30:53 2006
++++ examples/dump_video.c	Fri Jul 21 12:31:22 2006
+@@ -162,14 +162,14 @@ int main(int argc,char *argv[]){
+   int long_option_index;
+   int c;
+ 
+-  FILE *infile = stdin;
+-  outfile = stdout;
+-
+   struct timeval start;
+   struct timeval after;
+   struct timeval last;
+   int fps_only=0;
+   int frames=0;
++
++  FILE *infile = stdin;
++  outfile = stdout;
+ 
+ #ifdef _WIN32 /* We need to set stdin/stdout to binary mode on windows. */
+   /* Beware the evil ifdef. We avoid these where we can, but this one we
diff --git a/multimedia/libtheora/pkg/PLIST b/multimedia/libtheora/pkg/PLIST
index b353cf38e38..0e4450d57c9 100644
--- a/multimedia/libtheora/pkg/PLIST
+++ b/multimedia/libtheora/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/06/05 12:34:29 steven Exp $
+@comment $OpenBSD: PLIST,v 1.3 2006/07/21 11:24:07 steven Exp $
 %%SHARED%%
 include/theora/
 include/theora/theora.h
@@ -9,6 +9,6 @@ lib/pkgconfig/theora.pc
 share/doc/libtheora/
 share/doc/libtheora/color.html
 share/doc/libtheora/doxygen-build.stamp
-share/doc/libtheora/draft-barbato-avt-rtp-theora-00.txt
-share/doc/libtheora/draft-barbato-avt-rtp-theora-00.xml
+share/doc/libtheora/draft-barbato-avt-rtp-theora-01.txt
+share/doc/libtheora/draft-barbato-avt-rtp-theora-01.xml
 share/doc/libtheora/vp3-format.txt