diff --git a/build.gradle b/build.gradle
index a412555218..12f9af5a1c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,9 @@ dependencies {
     compile "com.github.jknack:handlebars:$versions.handlebars", {
         exclude group: 'org.mozilla', module: 'rhino'
     }
-    compile "com.github.jknack:handlebars-helpers:$versions.handlebars"
+    compile("com.github.jknack:handlebars-helpers:$versions.handlebars") {
+        exclude group: 'org.mozilla', module: 'rhino'
+    }
 
     testCompile "org.hamcrest:hamcrest-all:1.3"
     testCompile("org.jmock:jmock:2.5.1") {
@@ -144,6 +146,7 @@ shadowJar {
     relocate "org.eclipse", 'wiremock.org.eclipse'
     relocate "org.codehaus", 'wiremock.org.codehaus'
     relocate "com.google.common", 'wiremock.com.google.common'
+    relocate "com.google.thirdparty", 'wiremock.com.google.thirdparty'
     relocate "com.fasterxml.jackson", 'wiremock.com.fasterxml.jackson'
     relocate "org.apache", 'wiremock.org.apache'
     relocate "org.xmlunit", 'wiremock.org.xmlunit'