diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index 9f9f89a8ed36..c516d1c576c0 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cdcat
-PORTVERSION=	1.9
+PORTVERSION=	2.0
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		GOOGLE_CODE:lib7zip
@@ -30,7 +30,7 @@ BUILD_WRKSRC=	${WRKSRC}/src
 PROJECTHOST=	lib7zip
 USE_BZIP2=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qt3support xml \
+QT_COMPONENTS=	corelib gui xml \
 		linguist_build moc_build qmake_build uic_build
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
@@ -41,7 +41,10 @@ QMAKEFLAGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a" \
 		LIBS+="${MIF_WRKSRC}/MediaInfoLib/Project/GNU/Library/.libs/libmediainfo.a" \
 		LIBS+="${MIF_WRKSRC}/ZenLib/Project/GNU/Library/.libs/libzen.a" \
-		DEFINES+="MEDIAINFO_STATIC"
+		LIBS+="-lz -lbz2 -ltar -lexif" \
+		DEFINES+="MEDIAINFO_STATIC" \
+		DEFINES+="MEDIAINFO_UNICODE" \
+		DEFINES+="USE_LIBEXIF"
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
 # spoof tinderbox: build deps for multimedia/mediainfo
@@ -74,13 +77,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/lib7zip.a/s|^|#| ; \
-		 /-lmediainfo/s|^|#| ; \
-		 /libmediainfo/s|^|#| ; \
-		 s|-ldl|| ; \
-		 s|-std=c++0x || ; \
-		 s|-g || ; \
-		 s|-O2 ||' ${BUILD_WRKSRC}/${PORTNAME}.pro
+		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e \
 		's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp
 	@${REINPLACE_CMD} -e \
diff --git a/deskutils/cdcat/distinfo b/deskutils/cdcat/distinfo
index 15e87d3e265e..da74fb08be34 100644
--- a/deskutils/cdcat/distinfo
+++ b/deskutils/cdcat/distinfo
@@ -1,4 +1,4 @@
-SHA256 (cdcat-1.9.tar.bz2) = d9c83835e3544a1316bc4a10d5fb0efe19f556994424e5520f7edb2ce5f874da
-SIZE (cdcat-1.9.tar.bz2) = 367729
+SHA256 (cdcat-2.0.tar.bz2) = d9c6dd6d1ab0b997e35446c0370f03e69a40ac7f49492c3c70ae6224c568970a
+SIZE (cdcat-2.0.tar.bz2) = 382091
 SHA256 (lib7zip-1.4.1.tar.gz) = 20efb640c43c5d05e1f8d641eb0d01f8712648fe7989f275ec5b2997641316d9
 SIZE (lib7zip-1.4.1.tar.gz) = 95080