diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultToStringBuilder3.vm b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultToStringBuilder3.vm
new file mode 100644
index 000000000000..3579d40decc8
--- /dev/null
+++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultToStringBuilder3.vm
@@ -0,0 +1,7 @@
+public java.lang.String toString() {
+   return new org.apache.commons.lang3.builder.ToStringBuilder(this)
+#foreach ($member in $members)
+   .append("$member.name", $member.accessor)
+#end
+   .toString();
+}
\ No newline at end of file
diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java
index 7877242eb789..98aedf820084 100644
--- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java
+++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java
@@ -34,6 +34,7 @@ public class TemplateResourceLocator {
   private static final String DEFAULT_BUFFER = "/org/jetbrains/generate/tostring/template/DefaultBuffer.vm";
   private static final String DEFAULT_BUILDER = "/org/jetbrains/generate/tostring/template/DefaultBuilder.vm";
   private static final String DEFAULT_TOSTRINGBUILDER = "/org/jetbrains/generate/tostring/template/DefaultToStringBuilder.vm";
+  private static final String DEFAULT_TOSTRINGBUILDER3 = "/org/jetbrains/generate/tostring/template/DefaultToStringBuilder3.vm";
   private static final String DEFAULT_GUAVA = "/org/jetbrains/generate/tostring/template/DefaultGuava.vm";
 
   private TemplateResourceLocator() {}
@@ -48,7 +49,8 @@ public class TemplateResourceLocator {
         new TemplateResource("String concat (+) and super.toString()", readFile(DEFAULT_CONCAT_SUPER), true),
         new TemplateResource("StringBuffer", readFile(DEFAULT_BUFFER), true),
         new TemplateResource("StringBuilder (JDK 1.5)", readFile(DEFAULT_BUILDER), true),
-        new TemplateResource("ToStringBuilder (Apache Commons)", readFile(DEFAULT_TOSTRINGBUILDER), true),
+        new TemplateResource("ToStringBuilder (Apache commons-lang)", readFile(DEFAULT_TOSTRINGBUILDER), true),
+        new TemplateResource("ToStringBuilder (Apache commons-lang 3)", readFile(DEFAULT_TOSTRINGBUILDER3), true),
         new TemplateResource("Objects.toStringHelper (Guava)", readFile(DEFAULT_GUAVA), true),
         new TemplateResource("Groovy: String concat (+)", readFile(DEFAULT_CONCAT_GROOVY), true),
       };