diff --git a/jodd-decora/build.gradle b/jodd-decora/build.gradle
index 81093e28c..93fb05cd9 100644
--- a/jodd-decora/build.gradle
+++ b/jodd-decora/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 	api project(':jodd-servlet')
 	implementation project(':jodd-log')
 
-	api 'org.jodd:jodd-lagarto:5.1.+'
+	api 'org.jodd:jodd-lagarto:6.0.+'
 
 	provided lib.servlet
 
diff --git a/jodd-htmlstapler/build.gradle b/jodd-htmlstapler/build.gradle
index fa3da655e..961851cdc 100644
--- a/jodd-htmlstapler/build.gradle
+++ b/jodd-htmlstapler/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 	api project(':jodd-servlet')
 	implementation project(':jodd-log')
 
-	api 'org.jodd:jodd-lagarto:5.1.+'
+	api 'org.jodd:jodd-lagarto:6.0.+'
 
 	provided lib.servlet
 	provided lib.jsp
diff --git a/jodd-htmlstapler/src/main/java/jodd/htmlstapler/HtmlStaplerFilter.java b/jodd-htmlstapler/src/main/java/jodd/htmlstapler/HtmlStaplerFilter.java
index ddc7646af..0778c9137 100644
--- a/jodd-htmlstapler/src/main/java/jodd/htmlstapler/HtmlStaplerFilter.java
+++ b/jodd-htmlstapler/src/main/java/jodd/htmlstapler/HtmlStaplerFilter.java
@@ -28,8 +28,8 @@
 import jodd.bean.BeanUtil;
 import jodd.io.StreamUtil;
 import jodd.lagarto.TagVisitor;
-import jodd.lagarto.TagWriter;
 import jodd.lagarto.adapter.StripHtmlTagAdapter;
+import jodd.lagarto.visitor.TagWriter;
 import jodd.log.Logger;
 import jodd.log.LoggerFactory;
 import jodd.net.MimeTypes;
diff --git a/jodd-servlet/build.gradle b/jodd-servlet/build.gradle
index 8cf9d4cda..2aa3ba7cf 100644
--- a/jodd-servlet/build.gradle
+++ b/jodd-servlet/build.gradle
@@ -5,7 +5,7 @@ ext.moduleDescription = 'Jodd Servlet is set of web tools, including the nice ta
 dependencies {
 	api project(':jodd-core')
 	api project(':jodd-bean')
-	api 'org.jodd:jodd-lagarto:5.1.+'
+	api 'org.jodd:jodd-lagarto:6.0.+'
 
 	provided lib.servlet
 	provided lib.jsp
diff --git a/jodd-servlet/src/main/java/jodd/servlet/form/FormProcessorVisitor.java b/jodd-servlet/src/main/java/jodd/servlet/form/FormProcessorVisitor.java
index 9f2261658..33cddc57b 100755
--- a/jodd-servlet/src/main/java/jodd/servlet/form/FormProcessorVisitor.java
+++ b/jodd-servlet/src/main/java/jodd/servlet/form/FormProcessorVisitor.java
@@ -27,7 +27,7 @@
 
 import jodd.lagarto.Tag;
 import jodd.lagarto.TagType;
-import jodd.lagarto.TagWriter;
+import jodd.lagarto.visitor.TagWriter;
 import jodd.mutable.MutableInteger;
 import jodd.util.CharSequenceUtil;
 import jodd.util.StringUtil;
diff --git a/jodd-servlet/src/main/java/jodd/servlet/lagarto/SimpleLagartoServletFilter.java b/jodd-servlet/src/main/java/jodd/servlet/lagarto/SimpleLagartoServletFilter.java
index a4fe83d1f..aad54dba4 100755
--- a/jodd-servlet/src/main/java/jodd/servlet/lagarto/SimpleLagartoServletFilter.java
+++ b/jodd-servlet/src/main/java/jodd/servlet/lagarto/SimpleLagartoServletFilter.java
@@ -28,7 +28,7 @@
 import jodd.io.FastCharArrayWriter;
 import jodd.lagarto.LagartoParser;
 import jodd.lagarto.TagAdapter;
-import jodd.lagarto.TagWriter;
+import jodd.lagarto.visitor.TagWriter;
 
 import javax.servlet.http.HttpServletRequest;