diff --git a/sysutils/cfvers/Makefile b/sysutils/cfvers/Makefile
index 3f848003ba71..686928065b5e 100644
--- a/sysutils/cfvers/Makefile
+++ b/sysutils/cfvers/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	cfvers
-PORTVERSION=	0.4.6
+PORTVERSION=	0.5.4
 CATEGORIES=	sysutils devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nivo+kw+ports.bfa274@is-root.com
 COMMENT=	Configuration versioning system
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sqlite/main.py:${PORTSDIR}/databases/py-PySQLite10
@@ -20,13 +20,10 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=		cfv.1 cfvadmin.1
+MAN1=		cfv.1 cfvadmin.1 cfversd.1
+MAN5=		cfvers.conf.5 cfversd.conf.5
 DOCS=		AUTHORS NEWS README TODO doc/*.html
 
-post-configure:
-	${REINPLACE_CMD} -e 's,/etc/cfvers.conf,${PREFIX}/etc/cfvers.conf,g' \
-		${WRKSRC}/cfvers/cmd.py
-
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/sysutils/cfvers/distinfo b/sysutils/cfvers/distinfo
index 810df317daca..ffac7612aeb8 100644
--- a/sysutils/cfvers/distinfo
+++ b/sysutils/cfvers/distinfo
@@ -1,3 +1,3 @@
-MD5 (cfvers-0.4.6.tar.gz) = 2f6976acd17fda49b404ce4ad870777f
-SHA256 (cfvers-0.4.6.tar.gz) = eab76456434a19adaccb455fa76541d3b012955d0cce1e6bc8b081b48b817f6d
-SIZE (cfvers-0.4.6.tar.gz) = 112353
+MD5 (cfvers-0.5.4.tar.gz) = c215720abf5b0a081025cd7b2c78e867
+SHA256 (cfvers-0.5.4.tar.gz) = 3c910cadc3d3bfefcc8c71020fbc86d87bc3351fd66d88792c28d1f63f2c91a0
+SIZE (cfvers-0.5.4.tar.gz) = 182247
diff --git a/sysutils/cfvers/pkg-plist b/sysutils/cfvers/pkg-plist
index bdd770c46635..a454387f4999 100644
--- a/sysutils/cfvers/pkg-plist
+++ b/sysutils/cfvers/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 bin/cfv
 bin/cfvadmin
+sbin/cfversd
 %%PYTHON_SITELIBDIR%%/cfvers/repository/__init__.py
 %%PYTHON_SITELIBDIR%%/cfvers/repository/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cfvers/repository/__init__.pyo
@@ -22,6 +23,9 @@ bin/cfvadmin
 %%PYTHON_SITELIBDIR%%/cfvers/cmd.py
 %%PYTHON_SITELIBDIR%%/cfvers/cmd.pyc
 %%PYTHON_SITELIBDIR%%/cfvers/cmd.pyo
+%%PYTHON_SITELIBDIR%%/cfvers/gateway.py
+%%PYTHON_SITELIBDIR%%/cfvers/gateway.pyc
+%%PYTHON_SITELIBDIR%%/cfvers/gateway.pyo
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -29,6 +33,9 @@ bin/cfvadmin
 %%PORTDOCS%%%%DOCSDIR%%/cfv.html
 %%PORTDOCS%%%%DOCSDIR%%/cfvadmin.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/cfvers.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/cfversd.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/cfversd.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/cfvers/repository/
 @dirrm %%PYTHON_SITELIBDIR%%/cfvers/