diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index a49e085b4356..adabe8cd9fa6 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,56 +1,53 @@
 PORTNAME=	jenkins
 PORTVERSION=	2.298
 PORTREVISION=	1
 CATEGORIES=	devel java
-MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
+MASTER_SITES=	http://mirrors.jenkins.io/war/${PORTVERSION}/
 DISTNAME=	jenkins
 EXTRACT_SUFX=	.war
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Open-source continuous integration server
 
 LICENSE=	MIT
 
 USES=		cpe
+CPE_VENDOR=	cloudbees
+USE_JAVA=	yes
+USE_RC_SUBR=	jenkins
 
 CONFLICTS=	jenkins-lts-[0-9]*
-USE_JAVA=	yes
-JAVA_VERSION=	1.8+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-USE_RC_SUBR=	jenkins
-
-CPE_VENDOR=	cloudbees
-
-JENKINS_HOME?=	${PREFIX}/jenkins
-JENKINS_USER?=	jenkins
-JENKINS_GROUP?=	jenkins
+JENKINS_HOME?=		${PREFIX}/jenkins
+JENKINS_USER?=		jenkins
+JENKINS_GROUP?=		jenkins
 JENKINS_LOG_FILE?=	/var/log/jenkins.log
 
 .if ${JENKINS_USER} == "jenkins"
 USERS=	jenkins
 .endif
 .if ${JENKINS_GROUP} == "jenkins"
 GROUPS=	jenkins
 .endif
 
-SUB_LIST+=	JENKINS_HOME=${JENKINS_HOME} \
-		JENKINS_USER=${JENKINS_USER} \
+SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
 		JENKINS_GROUP=${JENKINS_GROUP} \
-		JAVA_HOME=${JAVA_HOME} \
-		JENKINS_LOG_FILE=${JENKINS_LOG_FILE}
-PLIST_SUB+=	JENKINS_USER=${JENKINS_USER} \
-		JENKINS_GROUP=${JENKINS_GROUP}
+		JENKINS_HOME=${JENKINS_HOME} \
+		JENKINS_LOG_FILE=${JENKINS_LOG_FILE} \
+		JENKINS_USER=${JENKINS_USER}
+PLIST_SUB+=	JENKINS_GROUP=${JENKINS_GROUP} \
+		JENKINS_USER=${JENKINS_USER}
 
 .include <bsd.port.pre.mk>
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${JENKINS_HOME}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>