diff --git a/multimedia/dvdid/Makefile b/multimedia/dvdid/Makefile
index e8122f1c78fa..1f7a67ae2db4 100644
--- a/multimedia/dvdid/Makefile
+++ b/multimedia/dvdid/Makefile
@@ -1,21 +1,28 @@
-# New ports collection makefile for:	dvdid
-# Date created:		2009-09-14
-# Whom:			Christopher Key <cjk32@cam.ac.uk>
-#
+# Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	dvdid
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2.0a
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.srcf.ucam.org/~cjk32/dvdid/
+MASTER_SITES=	http://dvdid.cjkey.org.uk/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Tool for calculating dvdids
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} dvdid.tag ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/html/api
+	cd ${WRKSRC}/doc/html/api && ${INSTALL_DATA} * ${DOCSDIR}/html/api
+.endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvdid/distinfo b/multimedia/dvdid/distinfo
index ec773f876ba8..63173a7d8851 100644
--- a/multimedia/dvdid/distinfo
+++ b/multimedia/dvdid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dvdid-0.1.1.tar.gz) = 2f08e88c8f84bb44ffcb8746bff14ab3d89300d9c12206d03bf0d88408e27d74
-SIZE (dvdid-0.1.1.tar.gz) = 332308
+SHA256 (dvdid-0.2.0a.tar.gz) = 4a8e5a9dad1515d2d699276298ea4ee51cc5cd71e1f245439623eeefdc9aae49
+SIZE (dvdid-0.2.0a.tar.gz) = 348272
diff --git a/multimedia/dvdid/pkg-descr b/multimedia/dvdid/pkg-descr
index 364ad85c724d..6e4a96f44db8 100644
--- a/multimedia/dvdid/pkg-descr
+++ b/multimedia/dvdid/pkg-descr
@@ -1,4 +1,5 @@
-Library and executable for calculating dvdids as returned by Windows' 
-IDvdInfo2::GetDiscID.
+The dvdid project provides a library and executable for calculating dvdids,
+as returned by Windows' IDvdInfo2::GetDiscID() method. It is available as
+source code, which should compile on Windows and any POSIX compliant platform.
 
-WWW:	http://www.srcf.ucam.org/~cjk32/dvdid/
+WWW: http://dvdid.cjkey.org.uk/
diff --git a/multimedia/dvdid/pkg-plist b/multimedia/dvdid/pkg-plist
index 9be2976ba61a..5ae9e726c860 100644
--- a/multimedia/dvdid/pkg-plist
+++ b/multimedia/dvdid/pkg-plist
@@ -2,37 +2,38 @@ bin/dvdid
 include/dvdid/dvdid.h
 include/dvdid/dvdid2.h
 include/dvdid/export.h
-@dirrm include/dvdid
 lib/libdvdid.a
 lib/libdvdid.la
 lib/libdvdid.so
-lib/libdvdid.so.0
-%%DOCSDIR%%/dvdid.tag
-%%DOCSDIR%%/html/api/annotated.html
-%%DOCSDIR%%/html/api/classes.html
-%%DOCSDIR%%/html/api/doxygen.css
-%%DOCSDIR%%/html/api/doxygen.png
-%%DOCSDIR%%/html/api/dvdid2_8h.html
-%%DOCSDIR%%/html/api/dvdid2_8h_source.html
-%%DOCSDIR%%/html/api/dvdid_8h.html
-%%DOCSDIR%%/html/api/dvdid_8h_source.html
-%%DOCSDIR%%/html/api/export_8h.html
-%%DOCSDIR%%/html/api/export_8h_source.html
-%%DOCSDIR%%/html/api/files.html
-%%DOCSDIR%%/html/api/functions.html
-%%DOCSDIR%%/html/api/functions_vars.html
-%%DOCSDIR%%/html/api/globals.html
-%%DOCSDIR%%/html/api/globals_defs.html
-%%DOCSDIR%%/html/api/globals_enum.html
-%%DOCSDIR%%/html/api/globals_eval.html
-%%DOCSDIR%%/html/api/globals_func.html
-%%DOCSDIR%%/html/api/globals_type.html
-%%DOCSDIR%%/html/api/index.html
-%%DOCSDIR%%/html/api/structdvdid__fileinfo__s.html
-%%DOCSDIR%%/html/api/tab_b.gif
-%%DOCSDIR%%/html/api/tab_l.gif
-%%DOCSDIR%%/html/api/tab_r.gif
-%%DOCSDIR%%/html/api/tabs.css
-@dirrm %%DOCSDIR%%/html/api
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+lib/libdvdid.so.1
+%%PORTDOCS%%%%DOCSDIR%%/dvdid.tag
+%%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dvdid2_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dvdid2_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dvdid_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dvdid_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structdvdid__fileinfo__s.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/tab_b.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/tab_l.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/tab_r.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api/tabs.css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/dvdid