diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 57895e31f827..5e31de237797 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -1,24 +1,23 @@
 PORTNAME=	lifelines
-PORTVERSION=	3.1.1
+DISTVERSION=	3.1.1
 PORTREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	https://github.com/MarcNo/lifelines/releases/download/${PORTVERSION}/
+MASTER_SITES=	https://github.com/lifelines/lifelines/releases/download/${DISTVERSION}/
 
 MAINTAINER=	matt@gsicomp.on.ca
 COMMENT=	Advanced genealogical system
-WWW=		http://marcno.github.io/lifelines/
+WWW=		https://lifelines.github.io/lifelines/
 
 LICENSE=	MIT
 
 USES=		autoreconf bison gmake iconv ncurses
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	YACC="bison -y"
 
-CONFLICTS_INSTALL=	atheme-services # bin/dbverify
+MAKE_JOBS_UNSAFE=	yes
 
-MAKE_JOBS_UNSAFE=yes
+CONFLICTS_INSTALL=	atheme-services # bin/dbverify
 
 # Lifelines always installs documenatation.  This is contrary to the FreeBSD
 # norm which uses --with-docs (aka DOCS) to do so.  We patch the Makefiles
@@ -26,15 +25,15 @@ MAKE_JOBS_UNSAFE=yes
 # Lifelines uses --with-docs to indicate that the full XML docbook toolcahin
 # needs to be installed to build the docs.  We use BUILDDOCS for that purpose.
 
-OPTIONS_DEFINE=		BUILDDOCS DOCS NLS
-OPTIONS_SUB=		yes
-BUILDDOCS_DESC=		Build documentation (requires docbook toolchain)
-DOCS_DESC=		Install documentation
-NLS_DESC=		Build with NLS support
+OPTIONS_DEFINE=	BUILDDOCS DOCS NLS
+OPTIONS_SUB=	yes
+BUILDDOCS_DESC=	Build documentation (requires docbook toolchain)
+DOCS_DESC=	Install documentation
+NLS_DESC=	Build with NLS support
 
+BUILDDOCS_BUILD_DEPENDS=	dblatex:textproc/dblatex \
+				xmlto:textproc/xmlto
 BUILDDOCS_CONFIGURE_WITH=	docs
-BUILDDOCS_BUILD_DEPENDS=	xmlto:textproc/xmlto \
-				dblatex:textproc/dblatex
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls