diff --git a/java/java-analysis-api/java-analysis-api.iml b/java/java-analysis-api/java-analysis-api.iml
index e4036f35aded..c62ac8a6ea10 100644
--- a/java/java-analysis-api/java-analysis-api.iml
+++ b/java/java-analysis-api/java-analysis-api.iml
@@ -11,5 +11,6 @@
     <orderEntry type="module" module-name="java-psi-api" />
     <orderEntry type="module" module-name="projectModel-api" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="module" module-name="uast-common" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-analysis-api/src/com/intellij/uast/UastMetaLanguage.java b/java/java-analysis-api/src/com/intellij/uast/UastMetaLanguage.java
new file mode 100644
index 000000000000..eaf559550e28
--- /dev/null
+++ b/java/java-analysis-api/src/com/intellij/uast/UastMetaLanguage.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.uast;
+
+import com.intellij.lang.Language;
+import com.intellij.lang.MetaLanguage;
+import com.intellij.util.containers.HashSet;
+import org.jetbrains.uast.UastLanguagePlugin;
+
+import java.util.Set;
+
+/**
+ * @author yole
+ */
+public class UastMetaLanguage extends MetaLanguage {
+  private final Set<Language> myLanguages = new HashSet<>();
+
+  protected UastMetaLanguage() {
+    super("UAST");
+    for (UastLanguagePlugin plugin: UastLanguagePlugin.Companion.getInstances()) {
+      myLanguages.add(plugin.getLanguage());
+    }
+  }
+
+  @Override
+  public boolean matchesLanguage(Language language) {
+    return myLanguages.contains(language);
+  }
+}
diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index fa544ff29c8e..cc64822a065b 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -49,6 +49,7 @@
     <orderEntry type="module" module-name="spellchecker" />
     <orderEntry type="library" name="nekohtml" level="project" />
     <orderEntry type="module" module-name="built-in-server" />
+    <orderEntry type="module" module-name="uast-java" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module-library">
       <library>
diff --git a/platform/analysis-api/analysis-api.iml b/platform/analysis-api/analysis-api.iml
index f2337e3c286d..ac3597a901f5 100644
--- a/platform/analysis-api/analysis-api.iml
+++ b/platform/analysis-api/analysis-api.iml
@@ -14,5 +14,4 @@
     <orderEntry type="module" module-name="projectModel-api" />
     <orderEntry type="module" module-name="editor-ui-api" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/platform/analysis-impl/analysis-impl.iml b/platform/analysis-impl/analysis-impl.iml
index f32f233d0f4e..eafc1b2b89cd 100644
--- a/platform/analysis-impl/analysis-impl.iml
+++ b/platform/analysis-impl/analysis-impl.iml
@@ -17,5 +17,6 @@
     <orderEntry type="module" module-name="editor-ui-ex" />
     <orderEntry type="module" module-name="indexing-impl" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="module" module-name="uast-common" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 869ac784b8c4..e31422fb1abd 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -904,6 +904,8 @@
     <extensionPoint name="metaLanguage" interface="com.intellij.lang.MetaLanguage"/>
 
     <extensionPoint name="longLineInspectionPolicy" interface="com.intellij.codeInspection.longLine.LongLineInspectionPolicy"/>
+    <extensionPoint qualifiedName="org.jetbrains.uast.uastLanguagePlugin"
+                    interface="org.jetbrains.uast.UastLanguagePlugin"/>
   </extensionPoints>
 </idea-plugin>
 
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 65ee0752c583..8a6c0cbbda6c 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -1022,6 +1022,9 @@
     <automaticRenamerFactory implementation="com.intellij.refactoring.rename.RelatedFilesRenamerFactory"/>
     <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveFilesOrDirectories.MoveRelatedFilesHandler"
                              order="before moveFileOrDir"/>
+
+    <projectService serviceInterface="org.jetbrains.uast.UastContext" serviceImplementation="org.jetbrains.uast.UastContext"/>
+    <metaLanguage implementation="com.intellij.uast.UastMetaLanguage"/>
   </extensions>
 </idea-plugin>
 
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 8917d1320afb..7368edd6c8e5 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -1918,6 +1918,10 @@
     <longLineInspectionPolicy implementation="com.intellij.codeInspection.JavaLongLineInspectionPolicy"/>
   </extensions>
 
+  <extensions defaultExtensionNs="org.jetbrains.uast">
+    <uastLanguagePlugin implementation="org.jetbrains.uast.java.JavaUastLanguagePlugin"/>
+  </extensions>
+
   <actions>
     <action id="ShowProjectStructureSettings" class="com.intellij.ide.actions.ShowStructureSettingsAction"
             icon="AllIcons.General.ProjectStructure">