diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index 1aab6e933248..a4d4c14ec7e5 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	groovy
-DISTVERSION=	2.3.9
+DISTVERSION=	2.4.4
 CATEGORIES=	lang java
 MASTER_SITES=	http://dl.bintray.com/groovy/maven/
-DISTFILES=	groovy-binary-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	apache-groovy-binary-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	mjs@Bur.st
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Agile dynamic language for the JVM
 
 LICENSE=	APACHE20
@@ -17,15 +17,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:tu}
 USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
+NO_ARCH=	yes
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-DATAFILES=	ANTLR-LICENSE.txt ASM-LICENSE.txt CLI-LICENSE.txt JSR223-LICENSE.txt LICENSE.txt conf lib
+DATAFILES=	CLI-LICENSE.txt conf lib
 SCRIPTFILES=	groovy groovyConsole groovyc groovysh java2groovy startGroovy
-PORTDOCS=	html pdf
+PORTDOCS=	html
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_DISTFILES=	groovy-docs-${PORTVERSION}${EXTRACT_SUFX}
+DOCS_DISTFILES=	apache-groovy-docs-${PORTVERSION}${EXTRACT_SUFX}
 
 .include <bsd.port.options.mk>
 
@@ -60,7 +61,7 @@ post-install:
 	@${FIND} -s ${DATAFILES:S,^,${WRKSRC}/,} -not -type d 2>/dev/null | \
 	  ${SED} -ne 's,^${WRKSRC},${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${FIND} -s -d ${DATAFILES:S,^,${WRKSRC}/,} -type d 2>/dev/null | \
-	  ${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${ECHO_CMD} '@dirrm ${DATADIR:S,^${PREFIX}/,,}' >> ${TMPPLIST}
+	  ${SED} -ne 's,^${WRKSRC},@dir ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${ECHO_CMD} '@dir ${DATADIR:S,^${PREFIX}/,,}' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/lang/groovy/distinfo b/lang/groovy/distinfo
index 6c22ab252766..f6529dd94cb1 100644
--- a/lang/groovy/distinfo
+++ b/lang/groovy/distinfo
@@ -1,4 +1,4 @@
-SHA256 (groovy-binary-2.3.9.zip) = 8840d120bb84d39836f08492ac2f6caefefc03ffe957031a6bbfada055d53619
-SIZE (groovy-binary-2.3.9.zip) = 32977396
-SHA256 (groovy-docs-2.3.9.zip) = 04392aa00e5041697d40f3d45424981d46057036778b568ada6a4bfe42a3f920
-SIZE (groovy-docs-2.3.9.zip) = 29317505
+SHA256 (apache-groovy-binary-2.4.4.zip) = a7cc1e5315a14ea38db1b2b9ce0792e35174161141a6a3e2ef49b7b2788c258c
+SIZE (apache-groovy-binary-2.4.4.zip) = 32472463
+SHA256 (apache-groovy-docs-2.4.4.zip) = ba9d9ab07b0039472a9e5c6dbfe8472c57249952ff8953cb692bb5e2c629a8e4
+SIZE (apache-groovy-docs-2.4.4.zip) = 17443243