diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 5d03c315aab..47a3f80a6a5 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,22 +1,21 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/16 03:24:28 merdely Exp $
+# $OpenBSD: Makefile,v 1.15 2008/01/26 02:10:26 jakemsr Exp $
 
 COMMENT=		tools to edit/modify/encode video streams
 
-DISTNAME=		mjpegtools-1.8.0
-PKGNAME=		${DISTNAME}p3
+DISTNAME=		mjpegtools-1.9.0rc3
 CATEGORIES=		multimedia
-SHARED_LIBS=		lavfile		3.0 \
-			lavfile-1.8	3.0 \
-			lavjpeg		3.0 \
-			lavjpeg-1.8	3.0 \
-			lavplay		3.0 \
-			lavplay-1.8	3.0 \
-			mjpegutils	3.0 \
-			mjpegutils-1.8	3.0 \
-			mpeg2encpp	4.0 \
-			mpeg2encpp-1.8	4.0 \
-			mplex2		4.0 \
-			mplex2-1.8	4.0
+SHARED_LIBS=		lavfile		4.0 \
+			lavfile-1.9	4.0 \
+			lavjpeg		4.0 \
+			lavjpeg-1.9	4.0 \
+			lavplay		4.0 \
+			lavplay-1.9	4.0 \
+			mjpegutils	4.0 \
+			mjpegutils-1.9	4.0 \
+			mpeg2encpp	5.0 \
+			mpeg2encpp-1.9	5.0 \
+			mplex2		5.0 \
+			mplex2-1.9	5.0
 
 HOMEPAGE=		http://mjpeg.sourceforge.net/
 
@@ -28,8 +27,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
-WANTLIB=		ICE SM X11 Xext Xrender c cairo fontconfig \
-			freetype glitz m pthread stdc++ usbhid z
+WANTLIB=		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+			Xfixes Xi Xinerama Xrandr Xrender c cairo expat \
+			fontconfig freetype glitz m pcre pthread stdc++ \
+			usbhid z
 
 MODULES+=		devel/gettext
 
@@ -44,15 +45,12 @@ LIB_DEPENDS=		SDL.>=2:sdl-*-!no_x11:devel/sdl \
 
 USE_X11=		Yes
 USE_LIBTOOL=		Yes
-AUTOMAKE_VERSION=	1.9
-AUTOCONF_VERSION=	2.59
 
-SEPARATE_BUILD=		concurrent
-CONFIGURE_STYLE=	autoconf no-autoheader automake
+CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-x --with-libpng --with-libdv
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			PKG_CONFIG="/usr/bin/pkg-config"
 
@@ -68,12 +66,9 @@ CONFIGURE_ARGS+=	--disable-simd-accel
 .if ${FLAVOR:L:Mquicktime}
 LIB_DEPENDS+=		quicktime.>=2::multimedia/libquicktime
 CONFIGURE_ARGS+=	--with-libquicktime
+WANTLIB+=		GL
 .else
 CONFIGURE_ARGS+=	--without-libquicktime
 .endif
 
-pre-configure:
-	cd ${WRKSRC} && env AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
-		AUTOCONF_VERSION=${AUTOCONF_VERSION} automake
-
 .include <bsd.port.mk>
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index 34ec4d1afad..cf734b500eb 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,5 +1,5 @@
-MD5 (mjpegtools-1.8.0.tar.gz) = b9mDYjEEgL2vcXHpZZ8WXw==
-RMD160 (mjpegtools-1.8.0.tar.gz) = TZempyHykiOXVgXipeZFtNfRKbU=
-SHA1 (mjpegtools-1.8.0.tar.gz) = 4R1oKYpktS+Yck2/P9FPFo4UApA=
-SHA256 (mjpegtools-1.8.0.tar.gz) = 2EFXXHLNDlh8G6twPQkG49I79ChCQABVdznPXWCXIJo=
-SIZE (mjpegtools-1.8.0.tar.gz) = 1475998
+MD5 (mjpegtools-1.9.0rc3.tar.gz) = 042tRDM+MjbMwNwe/bJ5EA==
+RMD160 (mjpegtools-1.9.0rc3.tar.gz) = 9HxxzXYoH7bgL9o9CLChQuE85ec=
+SHA1 (mjpegtools-1.9.0rc3.tar.gz) = QXgW5UjZ+7bDNt9kuI8xsC1v87E=
+SHA256 (mjpegtools-1.9.0rc3.tar.gz) = ix4+hSicudWKe5jQMs8lh+qVf4ZkFqM1kYZnsdrHb/c=
+SIZE (mjpegtools-1.9.0rc3.tar.gz) = 2537088
diff --git a/multimedia/mjpegtools/patches/patch-configure b/multimedia/mjpegtools/patches/patch-configure
new file mode 100644
index 00000000000..db933be95ef
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-configure
@@ -0,0 +1,20 @@
+$OpenBSD: patch-configure,v 1.5 2008/01/26 02:10:26 jakemsr Exp $
+--- configure.orig	Sat Jan 19 22:18:42 2008
++++ configure	Sat Jan 19 22:20:38 2008
+@@ -26853,7 +26853,7 @@ echo "${ECHO_T}no" >&6
+   fi
+ fi
+ 
+-
++if test x"opts" = x"yes"; then
+ if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
+   if test x$host_alias != x; then
+         echo "$as_me:$LINENO: checking sub-architecture settings" >&5
+@@ -26879,6 +26879,7 @@ echo $ECHO_N "checking sub-architecture settings... $E
+   fi
+   echo "$as_me:$LINENO: result: $ARCHFLAGS" >&5
+ echo "${ECHO_T}$ARCHFLAGS" >&6
++fi
+ fi
+ 
+ if test "x$enable_force_static" = "xyes" ; then
diff --git a/multimedia/mjpegtools/patches/patch-configure_ac b/multimedia/mjpegtools/patches/patch-configure_ac
deleted file mode 100644
index b5c5c63030e..00000000000
--- a/multimedia/mjpegtools/patches/patch-configure_ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2006/02/03 05:08:41 jakemsr Exp $
---- configure.ac.orig	Sun Sep 18 18:58:48 2005
-+++ configure.ac	Thu Dec 22 02:14:18 2005
-@@ -446,7 +446,8 @@ dnl done with the helper script cpuinfo.
- dnl correctly is complex and lengthy (about as long as the entire configure.ac
- dnl file).
- 
--if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
-+# if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
-+if false ; then
-   if test x$host_alias != x; then
-     dnl This is to allow cross compiling
-     AC_MSG_CHECKING(sub-architecture settings)
diff --git a/multimedia/mjpegtools/patches/patch-lavtools_Makefile_am b/multimedia/mjpegtools/patches/patch-lavtools_Makefile_am
deleted file mode 100644
index 27717c57e93..00000000000
--- a/multimedia/mjpegtools/patches/patch-lavtools_Makefile_am
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-lavtools_Makefile_am,v 1.1 2006/02/03 05:08:41 jakemsr Exp $
---- lavtools/Makefile.am.orig	Thu Jun 16 10:09:37 2005
-+++ lavtools/Makefile.am	Sat Dec 24 02:41:33 2005
-@@ -41,12 +41,13 @@ LAV_ALL_LIB_OPTS = \
- 
- liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
- liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS) $(LIBQUICKTIME_CFLAGS)
--liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
--	$(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
-+liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavfile_la_LIBADD = $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
- 
- liblavjpeg_la_SOURCES = jpegutils.c
- liblavjpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
--liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
-+liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavjpeg_la_LIBADD = $(JPEG_LIBS)
- 
- liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
- liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
-@@ -165,7 +166,8 @@ jpeg2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(JPE
- jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la $(JPEG_LIBS)
- 
- png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c
--png2yuv_LDADD = $(LIBMJPEGUTILS) -lpng -lz -lm
-+png2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPNG_CFLAGS)
-+png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS)
- 
- lavpipe_SOURCES = lavpipe.c pipelist.c
- lavpipe_LDADD = $(LIBMJPEGUTILS)
diff --git a/multimedia/mjpegtools/pkg/PFRAG.quicktime b/multimedia/mjpegtools/pkg/PFRAG.quicktime
new file mode 100644
index 00000000000..ae1171a66ea
--- /dev/null
+++ b/multimedia/mjpegtools/pkg/PFRAG.quicktime
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.quicktime,v 1.1 2008/01/26 02:10:26 jakemsr Exp $
+bin/qttoy4m
+bin/y4mtoqt
diff --git a/multimedia/mjpegtools/pkg/PFRAG.shared b/multimedia/mjpegtools/pkg/PFRAG.shared
index f32d5d8dbb1..3533e19a004 100644
--- a/multimedia/mjpegtools/pkg/PFRAG.shared
+++ b/multimedia/mjpegtools/pkg/PFRAG.shared
@@ -1,13 +1,13 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2006/02/03 05:08:41 jakemsr Exp $
-@lib lib/liblavfile-1.8.so.${LIBlavfile-1.8_VERSION}
+@comment $OpenBSD: PFRAG.shared,v 1.5 2008/01/26 02:10:26 jakemsr Exp $
+@lib lib/liblavfile-1.9.so.${LIBlavfile-1.9_VERSION}
 @lib lib/liblavfile.so.${LIBlavfile_VERSION}
-@lib lib/liblavjpeg-1.8.so.${LIBlavjpeg-1.8_VERSION}
+@lib lib/liblavjpeg-1.9.so.${LIBlavjpeg-1.9_VERSION}
 @lib lib/liblavjpeg.so.${LIBlavjpeg_VERSION}
-@lib lib/liblavplay-1.8.so.${LIBlavplay-1.8_VERSION}
+@lib lib/liblavplay-1.9.so.${LIBlavplay-1.9_VERSION}
 @lib lib/liblavplay.so.${LIBlavplay_VERSION}
-@lib lib/libmjpegutils-1.8.so.${LIBmjpegutils-1.8_VERSION}
+@lib lib/libmjpegutils-1.9.so.${LIBmjpegutils-1.9_VERSION}
 @lib lib/libmjpegutils.so.${LIBmjpegutils_VERSION}
-@lib lib/libmpeg2encpp-1.8.so.${LIBmpeg2encpp-1.8_VERSION}
+@lib lib/libmpeg2encpp-1.9.so.${LIBmpeg2encpp-1.9_VERSION}
 @lib lib/libmpeg2encpp.so.${LIBmpeg2encpp_VERSION}
-@lib lib/libmplex2-1.8.so.${LIBmplex2-1.8_VERSION}
+@lib lib/libmplex2-1.9.so.${LIBmplex2-1.9_VERSION}
 @lib lib/libmplex2.so.${LIBmplex2_VERSION}
diff --git a/multimedia/mjpegtools/pkg/PLIST b/multimedia/mjpegtools/pkg/PLIST
index dd32b9aba70..09e0db053c2 100644
--- a/multimedia/mjpegtools/pkg/PLIST
+++ b/multimedia/mjpegtools/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2007/02/08 11:31:16 bernd Exp $
+@comment $OpenBSD: PLIST,v 1.6 2008/01/26 02:10:26 jakemsr Exp $
 @conflict mplex-*
+%%quicktime%%
 bin/anytovcd.sh
 bin/glav
 bin/jpeg2yuv
@@ -11,6 +12,7 @@ bin/lavaddwav
 bin/lavinfo
 bin/lavpipe
 bin/lavplay
+bin/lavtc.sh
 bin/lavtrans
 bin/matteblend.flt
 bin/mjpeg_simd_helper
@@ -29,6 +31,7 @@ bin/y4mcolorbars
 bin/y4mdenoise
 bin/y4mhist
 bin/y4minterlace
+bin/y4mivtc
 bin/y4mshift
 bin/y4mspatialfilter
 bin/y4mstabilizer
@@ -63,15 +66,21 @@ include/mjpegtools/liblavplay.h
 include/mjpegtools/liblavrec.h
 include/mjpegtools/mjpeg_logging.h
 include/mjpegtools/mjpeg_types.h
+include/mjpegtools/motionsearch.h
 include/mjpegtools/mpeg2enc/
 include/mjpegtools/mpeg2enc/elemstrmwriter.hh
 include/mjpegtools/mpeg2enc/encoderparams.hh
 include/mjpegtools/mpeg2enc/encodertypes.h
+include/mjpegtools/mpeg2enc/imageplanes.hh
 include/mjpegtools/mpeg2enc/macroblock.hh
 include/mjpegtools/mpeg2enc/mpeg2coder.hh
 include/mjpegtools/mpeg2enc/mpeg2encoder.hh
 include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
 include/mjpegtools/mpeg2enc/mpeg2encparams.h
+include/mjpegtools/mpeg2enc/mpeg2syntaxcodes.h
+include/mjpegtools/mpeg2enc/ontheflyratectl.hh
+include/mjpegtools/mpeg2enc/pass1ratectl.hh
+include/mjpegtools/mpeg2enc/pass2ratectl.hh
 include/mjpegtools/mpeg2enc/picture.hh
 include/mjpegtools/mpeg2enc/picturereader.hh
 include/mjpegtools/mpeg2enc/predict_ref.h