diff --git a/python/python.iml b/python/python.iml
index eed4135fe38b..2cbf03f3ca5c 100644
--- a/python/python.iml
+++ b/python/python.iml
@@ -39,6 +39,7 @@
     <orderEntry type="library" name="microba" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="library" name="commons-lang" level="project" />
+    <orderEntry type="library" name="commons-collections" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index f038367f3c31..3e81b3a581d1 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -238,6 +238,8 @@
 
     <quoteHandler fileType="DjangoTemplate" className="com.jetbrains.django.lang.template.editor.DjangoTemplateQuoteHandler"/>
 
+    <lang.formatter language="DjangoTemplate" implementationClass="com.jetbrains.django.lang.template.formatter.DjangoTemplateFormattingModelBuilder"/>
+
     <!-- App Engine -->
     <facetType implementation="com.jetbrains.appengine.facet.AppEngineFacetType"/>