diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy b/core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy
index 8078516c7d5..4317cf9123f 100644
--- a/core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy
+++ b/core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy
@@ -25,6 +25,9 @@ grant {
   
   // groovy IndyInterface bootstrap requires this property for indy logging
   permission java.util.PropertyPermission "groovy.indy.logging", "read";
+  // groovy requires this to enable workaround for certain JVMs (https://github.com/apache/groovy/pull/137)
+  permission java.util.PropertyPermission "java.vm.name", "read";
+  permission java.util.PropertyPermission "groovy.use.classvalue", "read";
   
   // needed by Rhino engine exception handling
   permission java.util.PropertyPermission "rhino.stack.style", "read";
diff --git a/modules/lang-groovy/build.gradle b/modules/lang-groovy/build.gradle
index 9216001e593..89444a4e926 100644
--- a/modules/lang-groovy/build.gradle
+++ b/modules/lang-groovy/build.gradle
@@ -23,7 +23,7 @@ esplugin {
 }
 
 dependencies {
-  compile 'org.codehaus.groovy:groovy:2.4.4:indy'
+  compile 'org.codehaus.groovy:groovy:2.4.6:indy'
 }
 
 integTest {
diff --git a/modules/lang-groovy/licenses/groovy-2.4.4-indy.jar.sha1 b/modules/lang-groovy/licenses/groovy-2.4.4-indy.jar.sha1
deleted file mode 100644
index 30b996327b4..00000000000
--- a/modules/lang-groovy/licenses/groovy-2.4.4-indy.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-139af316ac35534120c53f05393ce46d60d6da48
\ No newline at end of file
diff --git a/modules/lang-groovy/licenses/groovy-2.4.6-indy.jar.sha1 b/modules/lang-groovy/licenses/groovy-2.4.6-indy.jar.sha1
new file mode 100644
index 00000000000..0cd895b333c
--- /dev/null
+++ b/modules/lang-groovy/licenses/groovy-2.4.6-indy.jar.sha1
@@ -0,0 +1 @@
+af78e80fab591a6dcf2d6ccb8bf34d1e888291be
\ No newline at end of file
diff --git a/modules/lang-groovy/licenses/groovy-NOTICE.txt b/modules/lang-groovy/licenses/groovy-NOTICE.txt
index 72eb32a9024..b863c49d312 100644
--- a/modules/lang-groovy/licenses/groovy-NOTICE.txt
+++ b/modules/lang-groovy/licenses/groovy-NOTICE.txt
@@ -1,5 +1,5 @@
-Apache Commons CLI
-Copyright 2001-2009 The Apache Software Foundation
+Apache Groovy
+Copyright 2003-2016 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).