diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index d1316b65d2d..ec8e2d0e0af 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.100 2006/08/02 08:24:34 alek Exp $
+# $OpenBSD: Makefile,v 1.101 2006/08/09 08:15:24 biorn Exp $
 
 # May not be hard to add more.
 ONLY_FOR_ARCHS=		amd64 i386 powerpc sparc64 arm
@@ -7,7 +7,7 @@ COMMENT=		"Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
 
 DISTNAME=		MPlayer-1.0pre8
 DIST_SUBDIR=		mplayer
-PKGNAME=		${DISTNAME:L}p0
+PKGNAME=		${DISTNAME:L}p1
 CATEGORIES=		x11
 EXTRACT_SUFX=		.tar.bz2
 
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=--disable-alsa \
 		--disable-libdv \
 		--disable-smb \
 		--disable-external-tremor \
-		--disable-internal-tremor \
+		--disable-faac \
 		--enable-theora \
 		--enable-select \
 		--enable-vorbis \
diff --git a/x11/mplayer/patches/patch-libmpcodecs_Makefile b/x11/mplayer/patches/patch-libmpcodecs_Makefile
new file mode 100644
index 00000000000..1429a0caa5f
--- /dev/null
+++ b/x11/mplayer/patches/patch-libmpcodecs_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libmpcodecs_Makefile,v 1.3 2006/08/09 08:15:24 biorn Exp $
+--- libmpcodecs/Makefile.orig	Mon Jul 31 23:10:41 2006
++++ libmpcodecs/Makefile	Mon Jul 31 23:11:10 2006
+@@ -267,7 +267,7 @@ OBJS=$(SRCS:.c=.o)
+ SRCS2=$(ENCODER_SRCS)
+ OBJS2=$(SRCS2:.c=.o)
+ 
+-CFLAGS  = $(OPTFLAGS) \
++CFLAGS  = -I.. $(OPTFLAGS) \
+           -I. -I.. \
+           -Inative \
+           -I../libmpdemux \