diff --git databases/neo4j/Makefile databases/neo4j/Makefile
index 8161c56f63f3..8f50661019be 100644
--- databases/neo4j/Makefile
+++ databases/neo4j/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	neo4j
 DISTVERSION=	3.3.2
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://dist.neo4j.org/
 DISTNAME=	${PORTNAME}-community-${DISTVERSION}-unix
@@ -9,7 +10,15 @@ DISTNAME=	${PORTNAME}-community-${DISTVERSION}-unix
 MAINTAINER=	jonathan@FreeBSD.org
 COMMENT=	High performance graph store and database
 
-LICENSE=	GPLv3
+# Bouncy Castle License is in fact MIT.
+# Scala is licensed under BSD3CLAUSE.
+# Java Servlet API is licensed under CDDL and GPLv2wCE
+LICENSE=	APACHE20 BSD2CLAUSE BSD3CLAUSE CDDL GPLv2wCE GPLv3 ISCL MIT MPL20 OFL11
+LICENSE_COMB=	multi
+LICENSE_NAME_GPLv2wCE=	GPLv2 with Classpath Exception
+LICENSE_FILE=	${WRKSRC}/LICENSES.txt
+LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS_GPLv2wCE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	bash:shells/bash
 
@@ -20,7 +29,7 @@ SHEBANG_FILES=	bin/cypher-shell bin/neo4j-admin bin/neo4j-shell bin/neo4j-import
 USE_JAVA=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
-SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
+SUB_LIST=	DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
 
 PLIST_SUB=	DBDIR=${DBDIR} DISTVERSION=${DISTVERSION}
 
@@ -35,17 +44,17 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tools/* \
-		${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
+		${STAGEDIR}${PREFIX}/${PORTNAME}/lib/tools
 .for name in cypher-shell neo4j neo4j-admin neo4j-import neo4j-shell
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${name} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/plugins
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/plugins
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/${PORTNAME}/lib
 .for f in ${PORTNAME}.conf
 	${INSTALL_DATA} ${WRKSRC}/conf/$f \
 		${STAGEDIR}${PREFIX}/etc/$f.sample
 .endfor
-	${MKDIR} ${STAGEDIR}${DBDIR} ${STAGEDIR}${PREFIX}/etc/neo4j-certificates
+	@${MKDIR} ${STAGEDIR}${DBDIR} ${STAGEDIR}${PREFIX}/etc/neo4j-certificates
 .include <bsd.port.mk>
diff --git databases/neo4j/files/neo4j.sh.in databases/neo4j/files/neo4j.sh.in
index 8aa90d6c4240..195a232b26b0 100644
--- databases/neo4j/files/neo4j.sh.in
+++ databases/neo4j/files/neo4j.sh.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # $FreeBSD$
 
diff --git databases/neo4j/pkg-plist databases/neo4j/pkg-plist
index f24af6f6dedd..61a6a0e19923 100644
--- databases/neo4j/pkg-plist
+++ databases/neo4j/pkg-plist
@@ -88,8 +88,8 @@ neo4j/lib/rhino-1.7R4.jar
 neo4j/lib/scala-library-2.11.12.jar
 neo4j/lib/scala-reflect-2.11.12.jar
 neo4j/lib/server-api-3.3.2.jar
-neo4j/libexec/tools/2.x-config-migrator.jar
-neo4j/libexec/tools/cypher-shell-all.jar
+neo4j/lib/tools/2.x-config-migrator.jar
+neo4j/lib/tools/cypher-shell-all.jar
 @dir neo4j/lib/plugins
 @dir %%DBDIR%%
 @dir etc/neo4j-certificates