diff --git a/build.gradle b/build.gradle
index 34f61f08d52..b4edf701a08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -107,7 +107,7 @@ configure(allprojects) { project ->
 				entry 'derbyclient'
 			}
 			dependency "org.apache.poi:poi-ooxml:4.1.2"
-			dependency "org.beanshell:bsh:2.0b5"
+			dependency "org.apache-extras.beanshell:bsh:2.0b6"
 			dependency "org.freemarker:freemarker:2.3.30"
 			dependency "org.hsqldb:hsqldb:2.5.0"
 			dependency "org.quartz-scheduler:quartz:2.3.2"
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 99e550fa328..0b06a7c56f0 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -20,7 +20,7 @@ dependencies {
 	optional("javax.xml.ws:jaxws-api")
 	optional("org.aspectj:aspectjweaver")
 	optional("org.codehaus.groovy:groovy")
-	optional("org.beanshell:bsh")
+	optional("org.apache-extras.beanshell:bsh")
 	optional("joda-time:joda-time")
 	optional("org.hibernate:hibernate-validator:5.4.3.Final")
 	optional("org.jetbrains.kotlin:kotlin-reflect")