diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index 9c2850ac361a..fb2084611bbc 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -2,39 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	rsvndump
-PORTVERSION=	0.5.8
+PORTVERSION=	0.6
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Remote Subversion repository dumpfile generator
 
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+
+OPTIONS_DEFINE=	DOCS NLS
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-svn=${LOCALBASE}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PLIST_FILES=	bin/rsvndump
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_FILES+=		share/locale/de/LC_MESSAGES/rsvndump.mo
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
-CONFIGURE_ARGS+=	--enable-man \
-			--with-svn=${LOCALBASE}
+DOCS_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
+			xmlto:${PORTSDIR}/textproc/xmlto
+DOCS_PLIST_FILES=	man/man1/rsvndump.1.gz
+DOCS_CONFIGURE_ENABLE=	man
 
-.if ${PORT_OPTIONS:MDOCS}
-MAN1=		rsvndump.1
-.endif
-PLIST_FILES+=	bin/rsvndump
+NLS_USES=		gettext
+NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/rsvndump.mo
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto
-CONFIGURE_ARGS+=--enable-man
-.else
-CONFIGURE_ARGS+=--disable-man
-.endif
-
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 .include <bsd.port.mk>
diff --git a/devel/rsvndump/distinfo b/devel/rsvndump/distinfo
index d5c4b0b12364..f7af600f5e63 100644
--- a/devel/rsvndump/distinfo
+++ b/devel/rsvndump/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsvndump-0.5.8.tar.gz) = 3b6748eeee7c47ef8c16fe3b987976458ab4e350e8b9f44525a4d153889e2b42
-SIZE (rsvndump-0.5.8.tar.gz) = 239808
+SHA256 (rsvndump-0.6.tar.gz) = bb32d7fc29dee2d34128d0c563d771ab2f1deb4eb704d65a7f2d066856644f1a
+SIZE (rsvndump-0.6.tar.gz) = 262738
diff --git a/devel/rsvndump/pkg-descr b/devel/rsvndump/pkg-descr
index 57d32e6205fb..6ba5cc2f16e6 100644
--- a/devel/rsvndump/pkg-descr
+++ b/devel/rsvndump/pkg-descr
@@ -4,4 +4,4 @@ the format that can be read an written by svnadmin dump, so the
 data which is produced can easily be imported into a new Subversion
 repository.
 
-WWW:    http://rsvndump.sourceforge.net/
+WWW: http://rsvndump.sourceforge.net/