diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 7a385cbdfb39..c7c78b669722 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,76 +1,75 @@
 # New ports collection makefile for:	mkvtoolnix
 # Date created:		Tue Feb 24 02:09:12 UTC 2004
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTVERSION=	3.3.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create Matroska media streams
 
 LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		ebml.0:${PORTSDIR}/textproc/libebml \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		lzo2.2:${PORTSDIR}/archivers/lzo2 \
 		matroska.0:${PORTSDIR}/multimedia/libmatroska \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		ogg.6:${PORTSDIR}/audio/libogg \
 		boost_regex.4:${PORTSDIR}/devel/boost-libs
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		ac_cv_path_PO4A=no
 CONFIGURE_ARGS=	--enable-lzo --enable-bz2 --disable-qt \
 		--with-boost=${LOCALBASE} \
 		--with-boost-filesystem=boost_filesystem \
 		--with-boost-system=boost_system \
 		--with-boost-regex=boost_regex
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		mkvextract.1 mkvinfo.1 mkvmerge.1 mkvpropedit.1
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not install on sparc64
 .endif
 
 .if defined(BATCH)
 MAKE_ENV+=	V=1
 .endif
 
 .ifndef(WITHOUT_WXGTK)
 USE_WX=		2.8+
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
 MAN1+=		mmg.1
 PLIST_SUB+=	GUI=""
 .else
 CONFIGURE_ARGS+=--disable-gui
 PLIST_SUB+=	GUI="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"-O3"|""|g' ${WRKSRC}/configure
 
 pre-configure::
 .ifndef(WITHOUT_WXGTK)
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can disable wxGTK2 support by defining"
 	@${ECHO_MSG} "===>  WITHOUT_WXGTK"
 	@${ECHO_MSG} "===>"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 83445c931d6a..11602473b9d8 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-MD5 (mkvtoolnix-3.2.0.tar.bz2) = 9bf31280cb07870771e69de0287dc769
-SHA256 (mkvtoolnix-3.2.0.tar.bz2) = 2b247053f48ccb8f2ba3e165d3751c82f7ede4948224383ce9b62f2b7ba746aa
-SIZE (mkvtoolnix-3.2.0.tar.bz2) = 1384155
+MD5 (mkvtoolnix-3.3.0.tar.bz2) = a002b6537e4515b6a0b26f42e8a2eb9a
+SHA256 (mkvtoolnix-3.3.0.tar.bz2) = a24fb6fbcd6779f02f8146ee448abfc6dab9ac23ed15b685b37e6a71e340a5f4
+SIZE (mkvtoolnix-3.3.0.tar.bz2) = 1369940
diff --git a/multimedia/mkvtoolnix/files/patch-handle_deps b/multimedia/mkvtoolnix/files/patch-handle_deps
new file mode 100644
index 000000000000..cd0b1b9e60ab
--- /dev/null
+++ b/multimedia/mkvtoolnix/files/patch-handle_deps
@@ -0,0 +1,11 @@
+--- handle_deps.orig	2010-03-24 22:48:35.000000000 +0900
++++ handle_deps	2010-03-27 02:43:11.000000000 +0900
+@@ -3,7 +3,7 @@
+ obj="$1"
+ exitcode="$2"
+ 
+-dep="`echo "$obj" | sed -e 's:\.\(o\|gch\)$:.d:'`"
++dep="`echo "$obj" | sed -E -e 's:\.(o|gch)$:.d:'`"
+ test -f "$dep" || exit $exitcode
+ 
+ test -f .deps && rm -f .deps