diff --git a/devel/gitblit/Makefile b/devel/gitblit/Makefile
index bb79ff3afc36..b42405ed2f07 100644
--- a/devel/gitblit/Makefile
+++ b/devel/gitblit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gitblit
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://dl.bintray.com/${PORTNAME}/releases/
 EXTRACT_SUFX=	.war
@@ -31,13 +32,10 @@ PLIST_SUB+=	GB_DATAHOME=${PREFIX}/${PORTNAME} \
 				GB_USER=${USERS}
 
 OPTIONS_RADIO=			SQL WEBSERVER
-OPTIONS_SINGLE=			TOMCAT
 OPTIONS_RADIO_SQL=		REDIS
 OPTIONS_RADIO_WEBSERVER=APACHE HIAWATHA LIGHTTPD NGINX
-OPTIONS_SINGLE_TOMCAT=	TOMCAT6 TOMCAT7
 HIAWATHA_DESC=			Hiawatha server support
 NGINX_DESC=				Nginx server support
-OPTIONS_DEFAULT=		TOMCAT7
 REDIS_RUN_DEPENDS=		redis-server:databases/redis
 
 .include <bsd.port.options.mk>
@@ -52,13 +50,8 @@ RUN_DEPENDS+=	hiawatha:www/hiawatha
 RUN_DEPENDS+=	nginx:www/nginx
 .endif
 
-.if ${PORT_OPTIONS:MTOMCAT6}
-GB_HOME=	${PREFIX}/apache-tomcat-6.0/webapps/${PORTNAME}
-RUN_DEPENDS+=	${LOCALBASE}/etc/rc.d/tomcat6:www/tomcat6
-.elif ${PORT_OPTIONS:MTOMCAT7}
 GB_HOME=	${PREFIX}/apache-tomcat-7.0/webapps/${PORTNAME}
 RUN_DEPENDS+=	${LOCALBASE}/etc/rc.d/tomcat7:www/tomcat7
-.endif
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/devel/gitblit/pkg-descr b/devel/gitblit/pkg-descr
index e29e25af352d..616c92447e9f 100644
--- a/devel/gitblit/pkg-descr
+++ b/devel/gitblit/pkg-descr
@@ -3,8 +3,8 @@ and serving Git repositories. It's designed primarily as a tool for
 small workgroups who want to host centralized repositories.
 
 Gitblit WAR is what you should download if you already have a servlet
-container available that you wish to use. Jetty 6/7/8 and Tomcat
-6/7 are known to work. Generally, any Servlet 2.5 or Servlet 3.0
+container available that you wish to use. Jetty 6/7/8 and Tomcat 7
+are known to work. Generally, any Servlet 2.5 or Servlet 3.0
 container should work.
 
 Gitblit can be used as a dumb repository viewer with no administrative