diff --git a/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java b/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java
index 74f8b12dfd75..ad6d169a0ffb 100644
--- a/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java
+++ b/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java
@@ -17,12 +17,14 @@ public abstract class TemplatesService {
   public static final String MAKO = "Mako";
   public static final String JINJA2 = "Jinja2";
   public static final String WEB2PY = "Web2Py";
+  public static final String CHAMELEON = "Chameleon";
 
   private static List<String> ALL_TEMPLATE_LANGUAGES = ContainerUtil.immutableList(NONE,
                                                                                    DJANGO,
                                                                                    MAKO,
                                                                                   JINJA2,
-                                                                                  WEB2PY);
+                                                                                  WEB2PY,
+                                                                                  CHAMELEON);
 
   public abstract Language getSelectedTemplateLanguage();
 
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 3d5f7db737bf..83a550bd247d 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -835,6 +835,16 @@
 
     <lang.elementManipulator forClass="com.jetbrains.web2py.templates.psi.Web2PyExtendIncludeTag"
                              implementationClass="com.jetbrains.web2py.templates.ref.Web2PyStringLiteralManipulator"/>
+
+    <!-- Chameleon -->
+    <fileTypeFactory implementation="com.jetbrains.pyramid.templates.file.ChameleonFileTypeFactory"/>
+    <lang.fileViewProviderFactory language="Chameleon"
+                                  implementationClass="com.jetbrains.pyramid.templates.file.ChameleonFileProviderFactory"/>
+    <lang.parserDefinition language="Chameleon"
+                           implementationClass="com.jetbrains.pyramid.templates.parser.ChameleonParserDefinition"/>
+    <editorHighlighterProvider filetype="Chameleon" implementationClass="com.jetbrains.pyramid.templates.highlighting.ChameleonEditorHighlighterProvider"/>
+    <lang.syntaxHighlighterFactory key="Chameleon"
+                                   implementationClass="com.jetbrains.pyramid.templates.highlighting.ChameleonHighlighterFactory"/>
   </extensions>
 
   <extensionPoints>