diff --git a/value/processor/pom.xml b/value/processor/pom.xml
index 4d9cf437aa..a99276f1df 100644
--- a/value/processor/pom.xml
+++ b/value/processor/pom.xml
@@ -51,6 +51,11 @@
1.0-rc4
provided
+
+ com.google.escapevelocity
+ escapevelocity
+ 0.9
+
com.google.guava
guava
diff --git a/value/src/main/java/com/google/auto/value/processor/AutoAnnotationTemplateVars.java b/value/src/main/java/com/google/auto/value/processor/AutoAnnotationTemplateVars.java
index 6aa5bd8f14..7b124b03dd 100644
--- a/value/src/main/java/com/google/auto/value/processor/AutoAnnotationTemplateVars.java
+++ b/value/src/main/java/com/google/auto/value/processor/AutoAnnotationTemplateVars.java
@@ -15,7 +15,7 @@
*/
package com.google.auto.value.processor;
-import com.google.auto.value.processor.escapevelocity.Template;
+import com.google.escapevelocity.Template;
import java.util.Map;
import java.util.Set;
diff --git a/value/src/main/java/com/google/auto/value/processor/AutoOneOfTemplateVars.java b/value/src/main/java/com/google/auto/value/processor/AutoOneOfTemplateVars.java
index a91a61570f..935295462a 100644
--- a/value/src/main/java/com/google/auto/value/processor/AutoOneOfTemplateVars.java
+++ b/value/src/main/java/com/google/auto/value/processor/AutoOneOfTemplateVars.java
@@ -15,8 +15,8 @@
*/
package com.google.auto.value.processor;
-import com.google.auto.value.processor.escapevelocity.Template;
import com.google.common.collect.ImmutableSet;
+import com.google.escapevelocity.Template;
import java.util.Map;
/**
diff --git a/value/src/main/java/com/google/auto/value/processor/AutoValueTemplateVars.java b/value/src/main/java/com/google/auto/value/processor/AutoValueTemplateVars.java
index eb4065403d..4a898ac037 100644
--- a/value/src/main/java/com/google/auto/value/processor/AutoValueTemplateVars.java
+++ b/value/src/main/java/com/google/auto/value/processor/AutoValueTemplateVars.java
@@ -16,11 +16,11 @@
package com.google.auto.value.processor;
import com.google.auto.value.processor.PropertyBuilderClassifier.PropertyBuilder;
-import com.google.auto.value.processor.escapevelocity.Template;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
+import com.google.escapevelocity.Template;
import java.util.Optional;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.util.Types;
diff --git a/value/src/main/java/com/google/auto/value/processor/GwtSerialization.java b/value/src/main/java/com/google/auto/value/processor/GwtSerialization.java
index a2ed4cf444..1d64162dde 100644
--- a/value/src/main/java/com/google/auto/value/processor/GwtSerialization.java
+++ b/value/src/main/java/com/google/auto/value/processor/GwtSerialization.java
@@ -18,8 +18,8 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toList;
-import com.google.auto.value.processor.escapevelocity.Template;
import com.google.common.collect.Multimap;
+import com.google.escapevelocity.Template;
import java.io.IOException;
import java.io.Writer;
import java.util.List;
diff --git a/value/src/main/java/com/google/auto/value/processor/TemplateVars.java b/value/src/main/java/com/google/auto/value/processor/TemplateVars.java
index c76f02e61f..a92f8bcaf0 100644
--- a/value/src/main/java/com/google/auto/value/processor/TemplateVars.java
+++ b/value/src/main/java/com/google/auto/value/processor/TemplateVars.java
@@ -15,10 +15,10 @@
*/
package com.google.auto.value.processor;
-import com.google.auto.value.processor.escapevelocity.Template;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.escapevelocity.Template;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilterInputStream;
diff --git a/value/src/test/java/com/google/auto/value/processor/TemplateVarsTest.java b/value/src/test/java/com/google/auto/value/processor/TemplateVarsTest.java
index 32a8a8cac8..0f5820e3ac 100644
--- a/value/src/test/java/com/google/auto/value/processor/TemplateVarsTest.java
+++ b/value/src/test/java/com/google/auto/value/processor/TemplateVarsTest.java
@@ -21,10 +21,10 @@
import static java.util.logging.Level.WARNING;
import static org.junit.Assert.fail;
-import com.google.auto.value.processor.escapevelocity.Template;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.reflect.Reflection;
+import com.google.escapevelocity.Template;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;