diff --git a/multimedia/Makefile b/multimedia/Makefile
index 60da8c4475ba..110336c8cf57 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -56,6 +56,7 @@
     SUBDIR += linux-realplayer
     SUBDIR += linux-xmovie
     SUBDIR += mjpegtools
+    SUBDIR += mkvtoolnix
     SUBDIR += mmpython
     SUBDIR += mmsclient
     SUBDIR += mpeg
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
new file mode 100644
index 000000000000..efbf773995be
--- /dev/null
+++ b/multimedia/mkvtoolnix/Makefile
@@ -0,0 +1,49 @@
+# 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=	0.8.5
+CATEGORIES=	multimedia audio
+MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
+
+MAINTAINER=	lioux@FreeBSD.org
+COMMENT=	Tools to extract from/get info about/create Matroska media streams
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatroska \
+		${LOCALBASE}/lib/libebml.a:${PORTSDIR}/textproc/libebml
+LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+		vorbis.3:${PORTSDIR}/audio/libvorbis
+
+USE_BZIP2=	yes
+USE_REINPLACE=	yes
+USE_SIZE=	yes
+USE_ICONV=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-extra-includes=${LOCALBASE}/include \
+		--with-extra-libs=${LOCALBASE}/lib
+
+MAN1=		base64tool.1 mkvextract.1 mkvinfo.1 mkvmerge.1 mmg.1
+
+post-patch:
+# disable GNU auto* tools
+	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
+		-n 10 ${REINPLACE_CMD} -E -e \
+		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+# this is gcc 2.x
+CFLAGS+= -DNO_WSTRING
+# use gcc 3.2
+USE_GCC=3.2
+.else
+# default for 5.x series
+USE_GCC=3.3
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
new file mode 100644
index 000000000000..4d04dd9b6595
--- /dev/null
+++ b/multimedia/mkvtoolnix/distinfo
@@ -0,0 +1,2 @@
+MD5 (mkvtoolnix-0.8.5.tar.bz2) = 1c7f2b5a8528356b7bb973c9ca47a1b2
+SIZE (mkvtoolnix-0.8.5.tar.bz2) = 472888
diff --git a/multimedia/mkvtoolnix/pkg-descr b/multimedia/mkvtoolnix/pkg-descr
new file mode 100644
index 000000000000..be7abf280b93
--- /dev/null
+++ b/multimedia/mkvtoolnix/pkg-descr
@@ -0,0 +1,8 @@
+[ excerpt (with adaptations) from developer's website with modifications ]
+
+MKVtoolnix will evolve into a set of tools to create, alter and
+inspect Matroska files under Linux and other Unices, just what the
+OGMtools do for the OGM format.
+
+Author: Moritz Bunkus <moritz@bunkus.org>
+WWW: http://www.bunkus.org/videotools/mkvtoolnix/
diff --git a/multimedia/mkvtoolnix/pkg-plist b/multimedia/mkvtoolnix/pkg-plist
new file mode 100644
index 000000000000..cc2fc4ee8d9f
--- /dev/null
+++ b/multimedia/mkvtoolnix/pkg-plist
@@ -0,0 +1,4 @@
+bin/base64tool
+bin/mkvextract
+bin/mkvinfo
+bin/mkvmerge