diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 99982c6cdd5..30865a08eb0 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2006/12/22 16:30:17 steven Exp $
+# $OpenBSD: Makefile,v 1.12 2007/02/08 11:31:16 bernd Exp $
 
 COMMENT=		"tools to edit/modify/encode video streams"
 
 DISTNAME=		mjpegtools-1.8.0
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		multimedia
 SHARED_LIBS=		lavfile		3.0 \
 			lavfile-1.8	3.0 \
diff --git a/multimedia/mjpegtools/pkg/PLIST b/multimedia/mjpegtools/pkg/PLIST
index 923ca6bd224..dd32b9aba70 100644
--- a/multimedia/mjpegtools/pkg/PLIST
+++ b/multimedia/mjpegtools/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2006/02/03 05:08:41 jakemsr Exp $
+@comment $OpenBSD: PLIST,v 1.5 2007/02/08 11:31:16 bernd Exp $
+@conflict mplex-*
 bin/anytovcd.sh
 bin/glav
 bin/jpeg2yuv