diff --git a/development/groovy/README b/development/groovy/README
index 3768c5a27c..a65361a29a 100644
--- a/development/groovy/README
+++ b/development/groovy/README
@@ -1,7 +1,10 @@
 Groovy is a dynamic language for the Java platform.
 
 This sets GROOVY_HOME=/usr/<libdir>/groovy and PATH to include
-/usr/<libdir>/groovy/bin.
+/usr/<libdir>/groovy/bin. This SlackBuild provides one for
+sh and one for csh. You can logout and login again or simply run:
+
+# source /etc/profile.d/groovy.sh
 
 The installation is like Java Runtime/SDK, in that it places everything by
 default in /usr/<libdir>/groovy.
diff --git a/development/groovy/doinst.sh b/development/groovy/doinst.sh
new file mode 100644
index 0000000000..1575140e0b
--- /dev/null
+++ b/development/groovy/doinst.sh
@@ -0,0 +1,16 @@
+# Handle configuration files
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+# List of configuration files (they should end in .new)
+
+config etc/profile.d/groovy.sh.new
+config etc/profile.d/groovy.csh.new
diff --git a/development/groovy/groovy.SlackBuild b/development/groovy/groovy.SlackBuild
index 06a09f22be..d0fce52acb 100644
--- a/development/groovy/groovy.SlackBuild
+++ b/development/groovy/groovy.SlackBuild
@@ -5,6 +5,7 @@
 # Originally by Jockey S. Kyd (jockey dot kyd at gmail dot com)
 #
 # Modified by Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
+# 2017 | Dhaby Xiloj | slack.dhabyx@gmail.com
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +26,7 @@
 # not, see <http://www.gnu.org/licenses/>.
 
 PRGNAM=groovy
-VERSION=${VERSION:-2.4.4}
+VERSION=${VERSION:-2.4.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,18 +64,29 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
-mv * $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
-cd ..
-rmdir $PRGNAM-$VERSION
+mv {bin,conf,embeddable,grooid,indy,lib} \
+  $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+
+# clean .bat files
+rm $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/bin/*.bat
+
+mkdir -p $PKG/usr/bin/
+pushd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/bin
+for file in *; do
+  ln -sf /usr/lib$LIBDIRSUFFIX/$PRGNAM/bin/$file $PKG/usr/bin/$file
+done
+popd
 
 # no need to install these with a .new extension
 mkdir -p $PKG/etc/profile.d
-cp -a $CWD/profile.d/$PRGNAM.*sh $PKG/etc/profile.d
-sed -i "s|@LIBDIR@|/usr/lib$LIBDIRSUFFIX|" $PKG/etc/profile.d/$PRGNAM.*sh
-chmod 0755 $PKG/etc/profile.d/$PRGNAM.*sh
-chown root:root $PKG/etc/profile.d/$PRGNAM.*sh
+cp -a $CWD/profile.d/$PRGNAM.*sh.new $PKG/etc/profile.d
+sed -i "s|@LIBDIR@|/usr/lib$LIBDIRSUFFIX|" $PKG/etc/profile.d/$PRGNAM.*sh.new
+chmod 0755 $PKG/etc/profile.d/$PRGNAM.*sh.new
+chown root:root $PKG/etc/profile.d/$PRGNAM.*sh.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM
+unzip $CWD/apache-$PRGNAM-docs-$VERSION.zip -d $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM
+cp -r LICENSE licenses NOTICE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/groovy/groovy.info b/development/groovy/groovy.info
index 57a1d1d1f5..0243d7079e 100644
--- a/development/groovy/groovy.info
+++ b/development/groovy/groovy.info
@@ -1,10 +1,12 @@
 PRGNAM="groovy"
-VERSION="2.4.4"
+VERSION="2.4.10"
 HOMEPAGE="http://groovy-lang.org/"
-DOWNLOAD="http://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.4.zip"
-MD5SUM="82b24e139b0dfc3261c5d9a48175f35c"
+DOWNLOAD="https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.10.zip \
+        https://dl.bintray.com/groovy/maven/apache-groovy-docs-2.4.10.zip"
+MD5SUM="d73b320c568e5b937ea66bf0b09201ad \
+        4ff68245bf1689aa8515778efca09eb2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="DhabyX"
+EMAIL="slack.dhabyx@gmail.com"
diff --git a/development/groovy/profile.d/groovy.csh.new b/development/groovy/profile.d/groovy.csh.new
new file mode 100644
index 0000000000..d78d17c924
--- /dev/null
+++ b/development/groovy/profile.d/groovy.csh.new
@@ -0,0 +1,2 @@
+#!/bin/csh
+setenv GROOVY_HOME @LIBDIR@/groovy
diff --git a/development/groovy/profile.d/groovy.sh.new b/development/groovy/profile.d/groovy.sh.new
new file mode 100644
index 0000000000..c17cf37e8f
--- /dev/null
+++ b/development/groovy/profile.d/groovy.sh.new
@@ -0,0 +1,2 @@
+#!/bin/sh
+export GROOVY_HOME=@LIBDIR@/groovy